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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 2010 UTC

…		…
1	/----------------------------------------------------------------------	1	/----------------------------------------------------------------------
2	* File: rxvtfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
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 2 of the License, or
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 <cstdlib>
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" },
…		…
156	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',	159	'0', '1', '8', 'a', 'd', 'x', 'm', 'y', 'g', 'W', 'X', '\'', '_',
157	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ	160	0x00cd, 0x00d5, 0x0114, 0x0177, 0x0643, // ÍÕĔŷﻙ
158	0x304c, 0x672c, // が本	161	0x304c, 0x672c, // が本
159	};	162	};
160		163
161	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
162
163	#define dTermDisplay Display *disp = term->dpy	164	#define dTermDisplay Display *disp = term->dpy
164	#define dTermGC GC gc = term->gc	165	#define dTermGC GC gc = term->gc
165		166
166	/////////////////////////////////////////////////////////////////////////////	167	/////////////////////////////////////////////////////////////////////////////
167		168
…		…
217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	218	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218	{	219	{
219	}	220	}
220		221
221	void	222	void
222	rxvt_font::set_name (char *name)	223	rxvt_font::set_name (char *name_)
223	{	224	{
224	if (this->name == name)	225	if (name == name_)
225	return;	226	return;
226		227
227	if (this->name) free (this->name); // let the compiler optimize	228	if (name) free (name); // let the compiler optimize
228	this->name = name;	229	name = name_;
229	}	230	}
230		231
231	void	232	void
232	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	233	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
233	{	234	{
234	dTermDisplay;	235	dTermDisplay;
235	dTermGC;	236	dTermGC;
236		237
237	if (color == Color_bg \|\| color == Color_transparent)	238	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	239	XClearArea (disp, d, x, y, w, h, false);
239	else if (color >= 0)	240	else if (color >= 0)
240	{	241	{
241	#if XFT	242	#if XFT
		243	Picture dst;
		244
		245	# ifdef HAVE_BG_PIXMAP
		246	if (term->bgPixmap.pixmap
		247	&& !term->pix_colors[color].is_opaque ()
		248	&& ((dst = XftDrawPicture (d))))
		249	{
		250	XClearArea (disp, d, x, y, w, h, false);
		251
		252	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		253	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		254	}
		255	else
		256	# endif
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	257	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		258
243	#else	259	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	260	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	261	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	262	#endif
247	}	263	}
248	}	264	}
249		265
250	/////////////////////////////////////////////////////////////////////////////	266	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		267
254	struct rxvt_font_default : rxvt_font {	268	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	269	struct rxvt_fontset *fs;
256		270
257	rxvt_font_default (rxvt_fontset *fs)	271	rxvt_font_default (rxvt_fontset *fs)
…		…
293	return false;	307	return false;
294		308
295	if (unicode <= 0x009f)	309	if (unicode <= 0x009f)
296	return true;	310	return true;
297		311
		312	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	313	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	314	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	315	return true;
		316	#endif
301		317
302	if (IS_COMPOSE (unicode))	318	if (IS_COMPOSE (unicode))
303	return true;	319	return true;
304		320
305	switch (unicode)	321	switch (unicode)
…		…
341	;	357	;
342		358
343	int width = text - tp;	359	int width = text - tp;
344	int fwidth = term->fwidth * width;	360	int fwidth = term->fwidth * width;
345		361
		362	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
347	{	364	{
		365	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	366	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	367	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	368	uint32_t *b = a + (offs & 15);
351		369
352	int W = fwidth;	370	int W = fwidth;
…		…
390		408
391	case 1: // rectangle, possibly stippled	409	case 1: // rectangle, possibly stippled
392	if (a)	410	if (a)
393	{	411	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		413
396	gcv.fill_style = FillStippled;	414	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	416	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	417	gcv.ts_y_origin = y;
400		418
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	437	(a - 1) * 9064, (b - 1) 90*64);
420	break;	438	break;
421	}	439	}
422	}	440	}
423	}	441	}
		442	#else
		443	if (0)
		444	;
		445	#endif
424	#if ENABLE_COMBINING	446	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	447	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	448	{
427	min_it (width, 2); // we only support wcwidth up to 2	449	min_it (width, 2); // we only support wcwidth up to 2
428		450
429	text_t chrs[2];	451	text_t chrs[2];
430	chrs [1] = NOCHAR;	452	chrs [1] = NOCHAR;
431		453
432	*chrs = cc->c1;	454	*chrs = cc->c1;
433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	455	rxvt_font f1 = (fs)[fs->find_font_idx (cc->c1)];
434	f1->draw (d, x, y, chrs, width, fg, bg);	456	f1->draw (d, x, y, chrs, width, fg, bg);
435		457
436	if (cc->c2 != NOCHAR)	458	if (cc->c2 != NOCHAR)
437	{	459	{
438	bool careful;	460	bool careful;
439		461
440	// prefer font of first character, for no good reasons	462	// prefer font of first character, for no good reasons
441	*chrs = cc->c2;	463	*chrs = cc->c2;
442	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	464	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443	? f1	465	? f1
444	: (*fs)[fs->find_font (cc->c2)];	466	: (*fs)[fs->find_font_idx (cc->c2)];
445		467
446	f2->draw (d, x, y, chrs, width, fg, Color_none);	468	f2->draw (d, x, y, chrs, width, fg, Color_none);
447	}	469	}
448	}	470	}
449	#endif	471	#endif
…		…
462		484
463	x += fwidth;	485	x += fwidth;
464	}	486	}
465	}	487	}
466		488
		489	struct rxvt_font_overflow : rxvt_font {
		490	struct rxvt_fontset *fs;
		491
		492	rxvt_font_overflow (rxvt_fontset *fs)
		493	: rxvt_font ()
		494	{
		495	this->fs = fs;
		496	}
		497
		498	rxvt_fontprop properties ()
		499	{
		500	rxvt_fontprop p;
		501
		502	p.width = p.height = 1;
		503	p.ascent = rxvt_fontprop::unset;
		504	p.weight = rxvt_fontprop::medium;
		505	p.slant = rxvt_fontprop::roman;
		506
		507	return p;
		508	}
		509
		510	bool load (const rxvt_fontprop &prop, bool force_prop)
		511	{
		512	width = 1; height = 1;
		513	ascent = 1; descent = 0;
		514
		515	set_name (strdup ("built-in rendition overflow font"));
		516
		517	return true;
		518	}
		519
		520	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		521	{
		522	return false;
		523	}
		524
		525	void draw (rxvt_drawable &d, int x, int y,
		526	const text_t *text, int len,
		527	int fg, int bg)
		528	{
		529	while (len--)
		530	{
		531	int fid = fs->find_font_idx (*text);
		532	(*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
		533	++text;
		534	x += term->fwidth;
		535	}
		536	}
		537	};
		538
467	/////////////////////////////////////////////////////////////////////////////	539	/////////////////////////////////////////////////////////////////////////////
468		540
469	struct rxvt_font_x11 : rxvt_font {	541	struct rxvt_font_x11 : rxvt_font {
470	rxvt_font_x11 () { f = 0; }	542	rxvt_font_x11 () { f = 0; }
471		543
…		…
479		551
480	void draw (rxvt_drawable &d, int x, int y,	552	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	553	const text_t *text, int len,
482	int fg, int bg);	554	int fg, int bg);
483		555
484	bool slow; // wether this is a proportional font or has other funny characteristics	556	bool slow; // whether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	557	XFontStruct *f;
486	bool enc2b, encm;	558	bool enc2b, encm;
487		559
488	char get_property (XFontStruct f, Atom property, const char *repl) const;	560	char get_property (XFontStruct f, Atom property, const char *repl) const;
489	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);	561	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
…		…
497	unsigned long value;	569	unsigned long value;
498		570
499	if (XGetFontProperty (f, property, &value))	571	if (XGetFontProperty (f, property, &value))
500	return XGetAtomName (term->dpy, value);	572	return XGetAtomName (term->dpy, value);
501	else	573	else
502	return rxvt_strdup (repl);	574	return repl ? strdup (repl) : 0;
503	}	575	}
504		576
505	rxvt_fontprop	577	rxvt_fontprop
506	rxvt_font_x11::properties ()	578	rxvt_font_x11::properties ()
507	{	579	{
…		…
589	return false;	661	return false;
590	}	662	}
591		663
592	// fix the size of scalable fonts	664	// fix the size of scalable fonts
593	static bool	665	static bool
594	replace_field (char buf, const char name, int index, const char old, const char *replace)	666	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
595	{	667	{
596	int slashes = 0;	668	int slashes = 0;
597	const char field, end;	669	const char field, end;
598		670
599	for (const char c = name; c; c++)	671	for (const char c = name; c; c++)
…		…
609	break;	681	break;
610	}	682	}
611		683
612	if (slashes >= 13 && (!old \|\| *field == old))	684	if (slashes >= 13 && (!old \|\| *field == old))
613	{	685	{
614	// TODO: check for overflow in font-name	686	size_t len = field - name;
615	strncpy (buf, name, field - name);	687	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
616	buf += field - name;	688	memcpy (*ptr, name, len);
617	strcpy (buf, replace);	689	strcpy (*ptr + len, replace);
618	strcat (buf, end);	690	strcat (*ptr, end);
619		691
620	return true;	692	return true;
621	}	693	}
622	else	694	else
623	{	695	{
624	strcpy (buf, name);	696	*ptr = strdup (name);
625		697
626	return false;	698	return false;
627	}	699	}
628	}	700	}
629		701
…		…
637	char field_str[64]; // enough for 128 bits	709	char field_str[64]; // enough for 128 bits
638		710
639	// first morph the font if required	711	// first morph the font if required
640	if (force_prop)	712	if (force_prop)
641	{	713	{
642	char fname[1024];	714	char *fname;
643		715
644	if (name[0] != '-')	716	if (name[0] != '-')
645	{	717	{
646	f = XLoadQueryFont (disp, name);	718	f = XLoadQueryFont (disp, name);
647		719
…		…
659	f = 0;	731	f = 0;
660	}	732	}
661		733
662	if (prop.weight != rxvt_fontprop::unset)	734	if (prop.weight != rxvt_fontprop::unset)
663	{	735	{
664	replace_field (fname, name, 2, 0,	736	replace_field (&fname, name, 2, 0,
665	prop.weight < rxvt_fontprop::bold	737	prop.weight < rxvt_fontprop::bold
666	? "medium" : "bold");	738	? "medium" : "bold");
667	set_name (strdup (fname));	739	set_name (fname);
668	}	740	}
669		741
670	if (prop.slant != rxvt_fontprop::unset)	742	if (prop.slant != rxvt_fontprop::unset)
671	{	743	{
672	replace_field (fname, name, 3, 0,	744	replace_field (&fname, name, 3, 0,
673	prop.slant < rxvt_fontprop::italic	745	prop.slant < rxvt_fontprop::italic
674	? "r" : "i"); // TODO: handle "o"blique, too	746	? "r" : "i"); // TODO: handle "o"blique, too
675	set_name (strdup (fname));	747	set_name (fname);
676	}	748	}
677	}	749	}
678		750
679	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	751	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
680	? 0 : prop.height);	752	? 0 : prop.height);
…		…
705	font_weight *fonts = new font_weight[count];	777	font_weight *fonts = new font_weight[count];
706		778
707	for (int i = 0; i < count; i++)	779	for (int i = 0; i < count; i++)
708	{	780	{
709	rxvt_fontprop p;	781	rxvt_fontprop p;
710	char fname[1024];	782	char *fname;
711		783
712	int diff = 0;	784	int diff = 0;
713		785
714	if (replace_field (fname, list[i], 6, '0', field_str))	786	if (replace_field (&fname, list[i], 6, '0', field_str))
715	diff += 10; // slightly penalize scalable fonts	787	diff += 10; // slightly penalize scalable fonts
		788	else
		789	{
		790	free (fname);
716	else if (replace_field (fname, list[i], 11, '0', "0"))	791	if (replace_field (&fname, list[i], 11, '0', "0"))
717	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	792	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		793	}
718		794
719	if (!set_properties (p, fname))	795	if (!set_properties (p, fname)
		796	// also weed out too large fonts
		797	\|\| (prop.height != rxvt_fontprop::unset
		798	&& p.height > prop.height))
		799	{
		800	free (fname);
720	continue;	801	continue;
721		802	}
722	if (prop.height != rxvt_fontprop::unset
723	&& p.height > prop.height) // weed out too large fonts
724	continue;
725		803
726	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	804	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;
727	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);	805	if (prop.weight != rxvt_fontprop::unset) diff += abs (prop.weight - p.weight);
728	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);	806	if (prop.slant != rxvt_fontprop::unset) diff += abs (prop.slant - p.slant);
729	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);	807	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
730		808
731	fonts[i].name = strdup (fname);	809	fonts[i].name = fname;
732	fonts[i].diff = diff;	810	fonts[i].diff = diff;
733	}	811	}
734		812
735	XFreeFontNames (list);	813	XFreeFontNames (list);
736		814
…		…
768	return false;	846	return false;
769		847
770	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	848	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
771	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	849	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
772		850
		851	cs = CS_UNKNOWN;
		852
773	if (registry && encoding)	853	if (registry && encoding)
774	{	854	{
775	char charset[64];	855	char charset[64];
776	snprintf (charset, 64, "%s-%s", registry, encoding);	856	snprintf (charset, 64, "%s-%s", registry, encoding);
777		857
778	cs = codeset_from_name (charset);	858	cs = codeset_from_name (charset);
779	}	859
780	else	860	if (cs == CS_UNKNOWN)
		861	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
781	{	862	}
		863
		864	free (registry);
		865	free (encoding);
		866
		867	if (cs == CS_UNKNOWN)
		868	{
782	const char *charset = get_property (f, XA_FONT, 0);	869	char *value = get_property (f, XA_FONT, 0);
		870	const char *charset = value;
783		871
784	if (!charset)	872	if (!charset)
785	charset = name;	873	charset = name;
786		874
787	int count = 13;	875	int count = 13;
788	while (*charset)	876	while (*charset)
789	if (*charset++ == '-' && !--count)	877	if (*charset++ == '-' && !--count)
790	break;	878	break;
791		879
792	cs = codeset_from_name (charset);	880	cs = codeset_from_name (charset);
		881	if (cs == CS_UNKNOWN)
		882	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		883
		884	free (value);
		885	}
		886
		887	if (cs == CS_UNKNOWN)
793	}	888	{
794		889	clear ();
795	free (registry);	890	return false;
796	free (encoding);	891	}
797		892
798	if (cs == CS_UNICODE)	893	if (cs == CS_UNICODE)
799	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	894	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
800		895
801	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	896	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
813	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	908	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
814		909
815	if (encm)	910	if (encm)
816	N += (f->max_byte1 - f->min_byte1)	911	N += (f->max_byte1 - f->min_byte1)
817	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	912	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
818		913
819	while (N)	914	while (N)
820	{	915	{
821	if (f->per_char[N].width > width)	916	if (f->per_char[N].width > width)
822	width = f->per_char[N].width;	917	width = f->per_char[N].width;
823		918
…		…
826	}	921	}
827	#endif	922	#endif
828		923
829	width = 1;	924	width = 1;
830		925
831	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	926	for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
832	{	927	{
833	if (FROM_UNICODE (cs, *t) == NOCHAR)	928	if (FROM_UNICODE (cs, *t) == NOCHAR)
834	continue;	929	continue;
835		930
836	// ignore characters we wouldn't use anyways	931	// ignore characters we wouldn't use anyways
…		…
848	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	943	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
849		944
850	if (width < g.width) width = g.width;	945	if (width < g.width) width = g.width;
851	}	946	}
852		947
853	if (cs == CS_UNKNOWN)	948	#if 0 // do it per-character
		949	if (prop && width > prop->width)
854	{	950	{
855	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
856
857	clear ();	951	clear ();
858	return false;	952	return false;
859	}	953	}
860
861	#if 0 // do it per-character
862	if (prop && width > prop->width)
863	{
864	clear ();
865	return false;
866	}
867	#endif	954	#endif
868		955
869	return true;	956	return true;
870	}	957	}
871		958
…		…
885	uint32_t ch = FROM_UNICODE (cs, unicode);	972	uint32_t ch = FROM_UNICODE (cs, unicode);
886		973
887	if (ch == NOCHAR)	974	if (ch == NOCHAR)
888	return false;	975	return false;
889		976
890	/* check wether the character exists in _this_ font. horrible. */	977	/* check whether the character exists in _this_ font. horrible. */
891	XCharStruct *xcs;	978	XCharStruct *xcs;
892		979
893	if (encm)	980	if (encm)
894	{	981	{
895	unsigned char byte1 = ch >> 8;	982	unsigned char byte1 = ch >> 8;
…		…
925	return false;	1012	return false;
926		1013
927	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1014	if (!prop \|\| prop->width == rxvt_fontprop::unset)
928	return true;	1015	return true;
929		1016
930	// check wether character overlaps previous/next character	1017	// check whether character overlaps previous/next character
931	int w = xcs->rbearing - xcs->lbearing;	1018	int w = xcs->rbearing - xcs->lbearing;
932	int wcw = max (WCWIDTH (unicode), 1);	1019	int wcw = max (WCWIDTH (unicode), 1);
933		1020
934	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1021	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
935		1022
…		…
975	else	1062	else
976	{	1063	{
977	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1064	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
978		1065
979	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1066	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
980		1067
981	if (slow)	1068	if (slow)
982	{	1069	{
983	do	1070	do
984	{	1071	{
985	if (xc->byte1 \|\| xc->byte2)	1072	if (xc->byte1 \|\| xc->byte2)
…		…
1007	else	1094	else
1008	{	1095	{
1009	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1096	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1010		1097
1011	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1098	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1012		1099
1013	if (slow)	1100	if (slow)
1014	{	1101	{
1015	do	1102	do
1016	{	1103	{
1017	if (*xc)	1104	if (*xc)
…		…
1043		1130
1044	void draw (rxvt_drawable &d, int x, int y,	1131	void draw (rxvt_drawable &d, int x, int y,
1045	const text_t *text, int len,	1132	const text_t *text, int len,
1046	int fg, int bg);	1133	int fg, int bg);
1047		1134
1048	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1135	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1049		1136
1050	protected:	1137	protected:
1051	XftFont *f;	1138	XftFont *f;
1052	};	1139	};
1053		1140
…		…
1109	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1196	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1110		1197
1111	#if 0 // clipping unfortunately destroys our precious double-width-characters	1198	#if 0 // clipping unfortunately destroys our precious double-width-characters
1112	// clip width, we can't do better, or can we?	1199	// clip width, we can't do better, or can we?
1113	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1200	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1114	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1201	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1115	#endif	1202	#endif
1116		1203
1117	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1204	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1118	FcPatternAddBool (p, FC_MINSPACE, 1);	1205	FcPatternAddBool (p, FC_MINSPACE, 1);
1119		1206
…		…
1152		1239
1153	XftUnlockFace (f);	1240	XftUnlockFace (f);
1154		1241
1155	int glheight = height;	1242	int glheight = height;
1156		1243
1157	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1244	for (uint16_t *t = extent_test_chars + ARRAY_LENGTH(extent_test_chars); t-- > extent_test_chars; )
1158	{	1245	{
1159	FcChar16 ch = *t;	1246	FcChar16 ch = *t;
1160		1247
1161	if (cs != CS_UNICODE	1248	if (cs != CS_UNICODE
1162	&& ch > 0x100	1249	&& ch > 0x100
…		…
1263	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1350	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1264	const text_t *text, int len,	1351	const text_t *text, int len,
1265	int fg, int bg)	1352	int fg, int bg)
1266	{	1353	{
1267	XGlyphInfo extents;	1354	XGlyphInfo extents;
1268	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1355	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1269	XftGlyphSpec *ep = enc;	1356	XftGlyphSpec *ep = enc;
1270		1357
1271	dTermDisplay;	1358	dTermDisplay;
1272	dTermGC;	1359	dTermGC;
1273		1360
1274	int w = term->fwidth * len;	1361	int w = term->fwidth * len;
1275	int h = term->fheight;	1362	int h = term->fheight;
1276		1363
1277	bool buffered = bg >= 0 // we don't use a transparent bg	1364	bool buffered = bg >= Color_transparent
1278	#ifndef FORCE_UNBUFFERED_XFT	1365	&& term->option (Opt_buffered);
1279	# ifdef ENABLE_TRANSPARENCY
1280	\|\| !term->am_transparent // we aren't transparent
1281	# endif
1282	#endif
1283	;
1284		1366
1285	// cut trailing spaces	1367	// cut trailing spaces
1286	while (len && text [len - 1] == ' ')	1368	while (len && text [len - 1] == ' ')
1287	len--;	1369	len--;
1288		1370
…		…
1294	int cwidth = term->fwidth;	1376	int cwidth = term->fwidth;
1295	FcChar32 fc = *text++; len--;	1377	FcChar32 fc = *text++; len--;
1296		1378
1297	while (len && *text == NOCHAR)	1379	while (len && *text == NOCHAR)
1298	text++, len--, cwidth += term->fwidth;	1380	text++, len--, cwidth += term->fwidth;
1299		1381
1300	if (fc != ' ') // skip spaces	1382	if (fc != ' ') // skip spaces
1301	{	1383	{
1302	FT_UInt glyph = XftCharIndex (disp, f, fc);	1384	FT_UInt glyph = XftCharIndex (disp, f, fc);
1303	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1385	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1304		1386
…		…
1319	{	1401	{
1320	if (ep != enc)	1402	if (ep != enc)
1321	{	1403	{
1322	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1404	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1323		1405
1324	if (0)	1406	#ifdef HAVE_BG_PIXMAP
1325	;	1407	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1326	#if defined(ENABLE_TRANSPARENCY) \|\| defined(XPM_BACKGROUND)	1408
1327	else if (bg < 0 && term->bgPixmap.pixmap)	1409	if (term->bgPixmap.pixmap
		1410	&& (bg == Color_transparent \|\| bg == Color_bg
		1411	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1328	{	1412	{
		1413	int src_x = x, src_y = y;
		1414
		1415	if (term->bgPixmap.flags & bgPixmap_t::isTransparent)
		1416	{
		1417	src_x += term->window_vt_x;
		1418	src_y += term->window_vt_y;
		1419	}
		1420
1329	if (term->bgPixmap.pmap_width >= x + term->window_vt_x+w	1421	if (term->bgPixmap.pmap_width >= src_x + w
1330	&& term->bgPixmap.pmap_height >= y + term->window_vt_y+h)	1422	&& term->bgPixmap.pmap_height >= src_y + h)
1331	{	1423	{
1332	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,	1424	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
1333	x + term->window_vt_x, y + term->window_vt_y,
1334	w, h, 0, 0);	1425	src_x, src_y, w, h, 0, 0);
1335	}	1426	}
1336	else	1427	else
1337	{	1428	{
1338	XGCValues gcv;	1429	XGCValues gcv;
1339		1430
1340	gcv.fill_style = FillTiled;	1431	gcv.fill_style = FillTiled;
1341	gcv.tile = term->bgPixmap.pixmap;	1432	gcv.tile = term->bgPixmap.pixmap;
1342	gcv.ts_x_origin = -x;	1433	gcv.ts_x_origin = -src_x;
1343	gcv.ts_y_origin = -y;	1434	gcv.ts_y_origin = -src_y;
1344		1435
1345	#if 0
1346	GC gc2 = XCreateGC (disp, d2,
1347	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1348	&gcv);
1349	#endif
1350	XChangeGC (disp, gc,	1436	XChangeGC (disp, gc,
1351	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1437	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1352	&gcv);	1438	&gcv);
1353		1439
1354	XFillRectangle (disp, d2, gc/gc2/, 0, 0, w, h);	1440	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1355		1441
1356	gcv.fill_style = FillSolid;	1442	gcv.fill_style = FillSolid;
1357	XChangeGC (disp, gc, GCFillStyle, &gcv);	1443	XChangeGC (disp, gc, GCFillStyle, &gcv);
1358	/* XFreeGC (disp, gc2); */	1444	}
1359		1445
		1446	if (dst)
		1447	{
		1448	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1449
		1450	// dst can only be set when bg >= 0
		1451	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
1360	}	1452	}
1361	}	1453	}
1362	#endif
1363	else	1454	else
		1455	#endif
1364	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1456	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1365		1457
1366	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1458	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1367	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1459	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1368	}	1460	}
1369	else	1461	else
…		…
1397	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1489	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1398	= rxvt_fontprop::unset;	1490	= rxvt_fontprop::unset;
1399	force_prop = false;	1491	force_prop = false;
1400		1492
1401	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1493	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1402	FONT_UNREF (*i);	1494	(*i)->unref ();
1403		1495
1404	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1496	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
1405	delete *p;	1497	delete *p;
1406		1498
1407	free (fontdesc); fontdesc = 0;	1499	free (fontdesc); fontdesc = 0;
…		…
1409	fonts.clear ();	1501	fonts.clear ();
1410		1502
1411	fallback = fallback_fonts;	1503	fallback = fallback_fonts;
1412	}	1504	}
1413		1505
		1506	void
		1507	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1508	{
		1509	font->set_term (term);
		1510
		1511	font->cs = cs;
		1512	font->loaded = false;
		1513	}
		1514
1414	rxvt_font *	1515	rxvt_font *
1415	rxvt_fontset::new_font (const char *name, codeset cs)	1516	rxvt_fontset::new_font (const char *name, codeset cs)
1416	{	1517	{
1417	rxvt_font *f;	1518	rxvt_font *f;
1418		1519
1419	if (!name \|\| !*name)	1520	if (!name \|\| !*name)
1420	{	1521	{
1421	name = "";	1522	name = "";
1422	f = new rxvt_font_default (this);	1523	f = new rxvt_font_default (this);
1423	}	1524	}
…		…
1434	f = new rxvt_font_x11;	1535	f = new rxvt_font_x11;
1435	}	1536	}
1436	else	1537	else
1437	f = new rxvt_font_x11;	1538	f = new rxvt_font_x11;
1438		1539
1439	f->set_term (term);
1440	f->set_name (strdup (name));	1540	f->set_name (strdup (name));
1441		1541	prepare_font (f, cs);
1442	f->cs = cs;
1443	f->loaded = false;
1444		1542
1445	return f;	1543	return f;
1446	}	1544	}
1447		1545
1448	/////////////////////////////////////////////////////////////////////////////	1546	/////////////////////////////////////////////////////////////////////////////
		1547
		1548	void
		1549	rxvt_fontset::push_font (rxvt_font *font)
		1550	{
		1551	// the fontCount index is reserved for the overflow font, it is only
		1552	// necessary when we get fontCount or more fonts, as they cannot be
		1553	// represented in the rendition.
		1554	if (fonts.size () == fontCount)
		1555	{
		1556	rxvt_font *f = new rxvt_font_overflow (this);
		1557
		1558	prepare_font (f, CS_UNICODE);
		1559	fonts.push_back (f);
		1560	}
		1561
		1562	fonts.push_back (font);
		1563	}
1449		1564
1450	void	1565	void
1451	rxvt_fontset::add_fonts (const char *desc)	1566	rxvt_fontset::add_fonts (const char *desc)
1452	{	1567	{
1453	if (desc)	1568	if (desc)
…		…
1491	if (!end)	1606	if (!end)
1492	end = desc + strlen (desc);	1607	end = desc + strlen (desc);
1493		1608
1494	if (end - desc < 511)	1609	if (end - desc < 511)
1495	{	1610	{
1496	strncpy (buf, desc, end - desc);	1611	memcpy (buf, desc, end - desc);
1497	buf[end - desc] = 0;	1612	buf[end - desc] = 0;
1498		1613
1499	fonts.push_back (new_font (buf, cs));	1614	push_font (new_font (buf, cs));
1500	}	1615	}
1501	else	1616	else
1502	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1617	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1503		1618
1504	desc = end + 1;	1619	desc = end + 1;
…		…
1532	{	1647	{
1533	clear ();	1648	clear ();
1534		1649
1535	fontdesc = strdup (desc);	1650	fontdesc = strdup (desc);
1536		1651
1537	fonts.push_back (new_font (0, CS_UNICODE));	1652	push_font (new_font (0, CS_UNICODE));
1538	realize_font (0);	1653	realize_font (0);
1539		1654
1540	add_fonts (desc);	1655	add_fonts (desc);
1541		1656
1542	return true;	1657	return true;
…		…
1551		1666
1552	return -1;	1667	return -1;
1553	}	1668	}
1554		1669
1555	int	1670	int
1556	rxvt_fontset::find_font (unicode_t unicode)	1671	rxvt_fontset::find_font_idx (unicode_t unicode)
1557	{	1672	{
1558	if (unicode >= 1<<20)	1673	if (unicode >= 1<<20)
1559	return 0;	1674	return 0;
1560		1675
1561	unicode_t hi = unicode >> 8;	1676	unicode_t hi = unicode >> 8;
…		…
1587	goto next_font;	1702	goto next_font;
1588		1703
1589	bool careful;	1704	bool careful;
1590	if (f->has_char (unicode, &prop, careful))	1705	if (f->has_char (unicode, &prop, careful))
1591	{	1706	{
1592	if (careful)	1707	i = (i << 1) \| careful;
1593	i \|= 128;
1594		1708
1595	goto found;	1709	goto found;
1596	}	1710	}
1597		1711
1598	next_font:	1712	next_font:
1599	if (i == fonts.size () - 1)	1713	if (i == fonts.size () - 1)
1600	{	1714	{
1601	if (fallback->name)	1715	if (fallback->name)
1602	{	1716	{
1603	// search through the fallback list	1717	// search through the fallback list
1604	fonts.push_back (new_font (fallback->name, fallback->cs));	1718	push_font (new_font (fallback->name, fallback->cs));
1605	fallback++;	1719	fallback++;
1606	}	1720	}
1607	else	1721	else
1608	{	1722	{
1609	// try to find a new font.	1723	// try to find a new font.
…		…
1640	FcPatternDestroy (match);	1754	FcPatternDestroy (match);
1641		1755
1642	if (find_font (font) < 0)	1756	if (find_font (font) < 0)
1643	{	1757	{
1644	char fontname[4096];	1758	char fontname[4096];
1645	sprintf (fontname, "xft:%-.4090s", font);	1759	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1646		1760
1647	fonts.push_back (new_font (fontname, CS_UNICODE));	1761	push_font (new_font (fontname, CS_UNICODE));
1648	}	1762	}
1649		1763
1650	free (font);	1764	free (font);
1651	}	1765	}
1652	#endif	1766	#endif
…		…
1674	}	1788	}
1675		1789
1676	return i;	1790	return i;
1677	}	1791	}
1678		1792
1679
1680

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs. Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.109 by sasha, Fri Aug 3 05:33:04 2007 UTC vs.
Revision 1.171 by sf-exg, Thu Dec 30 17:28:29 2010 UTC