[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.163 by root, Wed Mar 31 23:01:51 2010 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 <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
…		…
43	const char *name;	42	const char *name;
44	} fallback_fonts[] = {	43	} fallback_fonts[] = {
45	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },	44	{ CS_ISO8859_1, "----r-------c-*-iso8859-1" },
46	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },	45	{ CS_ISO8859_15, "----r-------c-*-iso8859-15" },
47	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },	46	{ CS_ISO8859_15, "----r-------c-*-fcd8859-15" },
48		47
49	#if ENCODING_EU	48	#if ENCODING_EU
50	// cyrillic	49	// cyrillic
51	{ CS_KOI8_R, "----r-------c-*-koi8-r" },	50	{ CS_KOI8_R, "----r-------c-*-koi8-r" },
52	{ CS_KOI8_U, "----r-------c-*-koi8-u" },	51	{ CS_KOI8_U, "----r-------c-*-koi8-u" },
53		52
54	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },	53	{ CS_ISO8859_2, "----r-------c-*-iso8859-2" },
55	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },	54	{ CS_ISO8859_3, "----r-------c-*-iso8859-3" },
56	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },	55	{ CS_ISO8859_4, "----r-------c-*-iso8859-4" },
57	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },	56	{ CS_ISO8859_5, "----r-------c-*-iso8859-5" },
58	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },	57	{ CS_ISO8859_6, "----r-------c-*-iso8859-6" },
…		…
65	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },	64	{ CS_ISO8859_14, "----r-------c-*-iso8859-14" },
66	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },	65	{ CS_ISO8859_16, "----r-------c-*-iso8859-16" },
67		66
68	# if XFT	67	# if XFT
69	{ CS_KOI8_U, "xft::lang=ru" },	68	{ CS_KOI8_U, "xft::lang=ru" },
70		69
71	{ CS_ISO8859_5, "xft::lang=ru" },	70	{ CS_ISO8859_5, "xft::lang=ru" },
72	{ CS_ISO8859_6, "xft::lang=ar" },	71	{ CS_ISO8859_6, "xft::lang=ar" },
73	{ CS_ISO8859_7, "xft::lang=el" },	72	{ CS_ISO8859_7, "xft::lang=el" },
74	{ CS_ISO8859_8, "xft::lang=he" },	73	{ CS_ISO8859_8, "xft::lang=he" },
75	{ CS_ISO8859_9, "xft::lang=tr" },	74	{ CS_ISO8859_9, "xft::lang=tr" },
…		…
80		79
81	// japanese	80	// japanese
82	#if ENCODING_JP \|\| ENCODING_JP_EXT	81	#if ENCODING_JP \|\| ENCODING_JP_EXT
83	# if XFT	82	# if XFT
84	// prefer xft for complex scripts	83	// prefer xft for complex scripts
		84	{ CS_JIS0208_1990_0, "xft:Sazanami Mincho:antialias=false" },
85	{ CS_JIS0208_1990_0, "xft:Kochi Gothic:antialias=false" },	85	{ 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" },	86	{ CS_JIS0208_1990_0, "xft:Mincho:antialias=false" },
88	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },	87	{ CS_JIS0208_1990_0, "xft::lang=ja:antialias=false" },
89	# endif	88	# endif
90	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	89	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
91	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },	90	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
…		…
163	#define dTermDisplay Display *disp = term->dpy	162	#define dTermDisplay Display *disp = term->dpy
164	#define dTermGC GC gc = term->gc	163	#define dTermGC GC gc = term->gc
165		164
166	/////////////////////////////////////////////////////////////////////////////	165	/////////////////////////////////////////////////////////////////////////////
167		166
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
184	/////////////////////////////////////////////////////////////////////////////
185
186	static const char *	167	static const char *
187	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)	168	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
188	{	169	{
189	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);	170	uint8_t *buf = rxvt_temp_buf<uint8_t> (len);
190	uint8_t *res = buf;	171	uint8_t *res = buf;
…		…
235	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
236	{	217	{
237	}	218	}
238		219
239	void	220	void
240	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
241	{	222	{
242	if (this->name == name)	223	if (name == name_)
243	return;	224	return;
244		225
245	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
246	this->name = name;	227	name = name_;
247	}	228	}
248		229
249	void	230	void
250	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const	231	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251	{	232	{
252	dTermDisplay;	233	dTermDisplay;
253	dTermGC;	234	dTermGC;
254		235
255	if (color == Color_bg)	236	if (color == Color_bg \|\| color == Color_transparent)
256	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
257	else if (color >= 0)	238	else if (color >= 0)
258	{	239	{
259	#if XFT	240	#if XFT
		241	Picture dst;
		242
		243	# ifdef HAVE_BG_PIXMAP
		244	if (term->bgPixmap.pixmap
		245	&& !term->pix_colors[color].is_opaque ()
		246	&& ((dst = XftDrawPicture (d))))
		247	{
		248	XClearArea (disp, d, x, y, w, h, false);
		249
		250	Picture solid_color_pict = XftDrawSrcPicture (d, &term->pix_colors[color].c);
		251	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, x, y, w, h);
		252	}
		253	else
		254	# endif
260	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
261	#else	257	#else
262	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
263	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
264	#endif	260	#endif
265	}	261	}
266	}	262	}
267		263
268	/////////////////////////////////////////////////////////////////////////////	264	/////////////////////////////////////////////////////////////////////////////
269
270	#include "table/linedraw.h"
271		265
272	struct rxvt_font_default : rxvt_font {	266	struct rxvt_font_default : rxvt_font {
273	struct rxvt_fontset *fs;	267	struct rxvt_fontset *fs;
274		268
275	rxvt_font_default (rxvt_fontset *fs)	269	rxvt_font_default (rxvt_fontset *fs)
…		…
288	p.slant = rxvt_fontprop::roman;	282	p.slant = rxvt_fontprop::roman;
289		283
290	return p;	284	return p;
291	}	285	}
292		286
293	bool load (const rxvt_fontprop &prop)	287	bool load (const rxvt_fontprop &prop, bool force_prop)
294	{	288	{
295	width = 1; height = 1;	289	width = 1; height = 1;
296	ascent = 1; descent = 0;	290	ascent = 1; descent = 0;
297		291
298	set_name (strdup ("built-in support font"));	292	set_name (strdup ("built-in support font"));
…		…
311	return false;	305	return false;
312		306
313	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
314	return true;	308	return true;
315		309
		310	#ifdef BUILTIN_GLYPHS
316	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
317	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
318	return true;	313	return true;
		314	#endif
319		315
320	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
321	return true;	317	return true;
322		318
323	switch (unicode)	319	switch (unicode)
…		…
359	;	355	;
360		356
361	int width = text - tp;	357	int width = text - tp;
362	int fwidth = term->fwidth * width;	358	int fwidth = term->fwidth * width;
363		359
		360	#ifdef BUILTIN_GLYPHS
364	if (0x2500 <= t && t <= 0x259f)	361	if (0x2500 <= t && t <= 0x259f)
365	{	362	{
		363	# include "table/linedraw.h"
366	uint16_t offs = linedraw_offs[t - 0x2500];	364	uint16_t offs = linedraw_offs[t - 0x2500];
367	uint32_t *a = linedraw_command + (offs >> 4);	365	uint32_t *a = linedraw_command + (offs >> 4);
368	uint32_t *b = a + (offs & 15);	366	uint32_t *b = a + (offs & 15);
369		367
370	int W = fwidth;	368	int W = fwidth;
…		…
408		406
409	case 1: // rectangle, possibly stippled	407	case 1: // rectangle, possibly stippled
410	if (a)	408	if (a)
411	{	409	{
412	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	410	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
413		411
414	gcv.fill_style = FillStippled;	412	gcv.fill_style = FillStippled;
415	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	413	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
416	gcv.ts_x_origin = x;	414	gcv.ts_x_origin = x;
417	gcv.ts_y_origin = y;	415	gcv.ts_y_origin = y;
418		416
…		…
437	(a - 1) * 9064, (b - 1) 90*64);	435	(a - 1) * 9064, (b - 1) 90*64);
438	break;	436	break;
439	}	437	}
440	}	438	}
441	}	439	}
		440	#else
		441	if (0)
		442	;
		443	#endif
442	#if ENABLE_COMBINING	444	#if ENABLE_COMBINING
443	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	445	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
444	{	446	{
445	min_it (width, 2); // we only support wcwidth up to 2	447	min_it (width, 2); // we only support wcwidth up to 2
446		448
…		…
459	*chrs = cc->c2;	461	*chrs = cc->c2;
460	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
461	? f1	463	? f1
462	: (*fs)[fs->find_font (cc->c2)];	464	: (*fs)[fs->find_font (cc->c2)];
463		465
464	f2->draw (d, x, y, chrs, width, fg, -1);	466	f2->draw (d, x, y, chrs, width, fg, Color_none);
465	}	467	}
466	}	468	}
467	#endif	469	#endif
468	else	470	else
469	switch (t)	471	switch (t)
…		…
480		482
481	x += fwidth;	483	x += fwidth;
482	}	484	}
483	}	485	}
484		486
		487	struct rxvt_font_overflow : rxvt_font {
		488	struct rxvt_fontset *fs;
		489
		490	rxvt_font_overflow (rxvt_fontset *fs)
		491	: rxvt_font ()
		492	{
		493	this->fs = fs;
		494	}
		495
		496	rxvt_fontprop properties ()
		497	{
		498	rxvt_fontprop p;
		499
		500	p.width = p.height = 1;
		501	p.ascent = rxvt_fontprop::unset;
		502	p.weight = rxvt_fontprop::medium;
		503	p.slant = rxvt_fontprop::roman;
		504
		505	return p;
		506	}
		507
		508	bool load (const rxvt_fontprop &prop, bool force_prop)
		509	{
		510	width = 1; height = 1;
		511	ascent = 1; descent = 0;
		512
		513	set_name (strdup ("built-in rendition overflow font"));
		514
		515	return true;
		516	}
		517
		518	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
		519	{
		520	return false;
		521	}
		522
		523	void draw (rxvt_drawable &d, int x, int y,
		524	const text_t *text, int len,
		525	int fg, int bg)
		526	{
		527	while (len--)
		528	{
		529	int fid = fs->find_font_idx (*text);
		530	(*fs)[fid]->draw (d, x, y, text, 1, fg, bg);
		531	++text;
		532	x += term->fwidth;
		533	}
		534	}
		535	};
		536
485	/////////////////////////////////////////////////////////////////////////////	537	/////////////////////////////////////////////////////////////////////////////
486		538
487	struct rxvt_font_x11 : rxvt_font {	539	struct rxvt_font_x11 : rxvt_font {
488	rxvt_font_x11 () { f = 0; }	540	rxvt_font_x11 () { f = 0; }
489		541
490	void clear ();	542	void clear ();
491		543
492	rxvt_fontprop properties ();	544	rxvt_fontprop properties ();
493		545
494	bool load (const rxvt_fontprop &prop);	546	bool load (const rxvt_fontprop &prop, bool force_prop);
495		547
496	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	548	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
497		549
498	void draw (rxvt_drawable &d, int x, int y,	550	void draw (rxvt_drawable &d, int x, int y,
499	const text_t *text, int len,	551	const text_t *text, int len,
500	int fg, int bg);	552	int fg, int bg);
501		553
502	bool slow; // wether this is a proportional font or has other funny characteristics	554	bool slow; // whether this is a proportional font or has other funny characteristics
503	XFontStruct *f;	555	XFontStruct *f;
504	codeset cs;
505	bool enc2b, encm;	556	bool enc2b, encm;
506		557
507	char get_property (XFontStruct f, Atom property, const char *repl) const;	558	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);	559	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);	560	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
516	unsigned long value;	567	unsigned long value;
517		568
518	if (XGetFontProperty (f, property, &value))	569	if (XGetFontProperty (f, property, &value))
519	return XGetAtomName (term->dpy, value);	570	return XGetAtomName (term->dpy, value);
520	else	571	else
521	return rxvt_strdup (repl);	572	return repl ? strdup (repl) : 0;
522	}	573	}
523		574
524	rxvt_fontprop	575	rxvt_fontprop
525	rxvt_font_x11::properties ()	576	rxvt_font_x11::properties ()
526	{	577	{
…		…
608	return false;	659	return false;
609	}	660	}
610		661
611	// fix the size of scalable fonts	662	// fix the size of scalable fonts
612	static bool	663	static bool
613	replace_field (char buf, const char name, int index, const char old, const char *replace)	664	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
614	{	665	{
615	int slashes = 0;	666	int slashes = 0;
616	const char field, end;	667	const char field, end;
617		668
618	for (const char c = name; c; c++)	669	for (const char c = name; c; c++)
…		…
628	break;	679	break;
629	}	680	}
630		681
631	if (slashes >= 13 && (!old \|\| *field == old))	682	if (slashes >= 13 && (!old \|\| *field == old))
632	{	683	{
633	// TODO: check for overflow in font-name	684	size_t len = field - name;
634	strncpy (buf, name, field - name);	685	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
635	buf += field - name;	686	memcpy (*ptr, name, len);
636	strcpy (buf, replace);	687	strcpy (*ptr + len, replace);
637	strcat (buf, end);	688	strcat (*ptr, end);
638		689
639	return true;	690	return true;
640	}	691	}
641	else	692	else
642	{	693	{
643	strcpy (buf, name);	694	*ptr = strdup (name);
644		695
645	return false;	696	return false;
646	}	697	}
647	}	698	}
648		699
649	bool	700	bool
650	rxvt_font_x11::load (const rxvt_fontprop &prop)	701	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
651	{	702	{
652	dTermDisplay;	703	dTermDisplay;
653		704
654	clear ();	705	clear ();
655		706
656	char field_str[64]; // enough for 128 bits	707	char field_str[64]; // enough for 128 bits
657		708
658	// first morph the font if required	709	// first morph the font if required
659	if (prop.weight != rxvt_fontprop::unset	710	if (force_prop)
660	\|\| prop.slant != rxvt_fontprop::unset)
661	{	711	{
662	char fname[1024];	712	char *fname;
663		713
664	if (name[0] != '-')	714	if (name[0] != '-')
665	{	715	{
666	f = XLoadQueryFont (disp, name);	716	f = XLoadQueryFont (disp, name);
667		717
…		…
679	f = 0;	729	f = 0;
680	}	730	}
681		731
682	if (prop.weight != rxvt_fontprop::unset)	732	if (prop.weight != rxvt_fontprop::unset)
683	{	733	{
684	replace_field (fname, name, 2, 0,	734	replace_field (&fname, name, 2, 0,
685	prop.weight < rxvt_fontprop::bold	735	prop.weight < rxvt_fontprop::bold
686	? "medium" : "bold");	736	? "medium" : "bold");
687	set_name (strdup (fname));	737	set_name (fname);
688	}	738	}
689		739
690	if (prop.slant != rxvt_fontprop::unset)	740	if (prop.slant != rxvt_fontprop::unset)
691	{	741	{
692	replace_field (fname, name, 3, 0,	742	replace_field (&fname, name, 3, 0,
693	prop.slant < rxvt_fontprop::italic	743	prop.slant < rxvt_fontprop::italic
694	? "r" : "i"); // TODO: handle "o"blique, too	744	? "r" : "i"); // TODO: handle "o"blique, too
695	set_name (strdup (fname));	745	set_name (fname);
696	}	746	}
697	}	747	}
698		748
699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	749	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
700	? 0 : prop.height);	750	? 0 : prop.height);
…		…
725	font_weight *fonts = new font_weight[count];	775	font_weight *fonts = new font_weight[count];
726		776
727	for (int i = 0; i < count; i++)	777	for (int i = 0; i < count; i++)
728	{	778	{
729	rxvt_fontprop p;	779	rxvt_fontprop p;
730	char fname[1024];	780	char *fname;
731		781
732	int diff = 0;	782	int diff = 0;
733		783
734	if (replace_field (fname, list[i], 6, '0', field_str))	784	if (replace_field (&fname, list[i], 6, '0', field_str))
735	diff += 10; // slightly penalize scalable fonts	785	diff += 10; // slightly penalize scalable fonts
		786	else
		787	{
		788	free (fname);
736	else if (replace_field (fname, list[i], 11, '0', "0"))	789	if (replace_field (&fname, list[i], 11, '0', "0"))
737	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	790	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		791	}
738		792
739	if (!set_properties (p, fname))	793	if (!set_properties (p, fname))
740	continue;	794	continue;
741		795
742	if (prop.height != rxvt_fontprop::unset	796	if (prop.height != rxvt_fontprop::unset
…		…
746	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	800	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);	801	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);	802	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);	803	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
750		804
751	fonts[i].name = strdup (fname);	805	fonts[i].name = fname;
752	fonts[i].diff = diff;	806	fonts[i].diff = diff;
753	}	807	}
754		808
755	XFreeFontNames (list);	809	XFreeFontNames (list);
756		810
…		…
788	return false;	842	return false;
789		843
790	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	844	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
791	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	845	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
792		846
		847	cs = CS_UNKNOWN;
		848
793	if (registry && encoding)	849	if (registry && encoding)
794	{	850	{
795	char charset[64];	851	char charset[64];
796	snprintf (charset, 64, "%s-%s", registry, encoding);	852	snprintf (charset, 64, "%s-%s", registry, encoding);
797		853
798	cs = codeset_from_name (charset);	854	cs = codeset_from_name (charset);
		855
		856	if (cs == CS_UNKNOWN)
		857	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
799	}	858	}
800	else	859
		860	free (registry);
		861	free (encoding);
		862
		863	if (cs == CS_UNKNOWN)
801	{	864	{
802	const char *charset = get_property (f, XA_FONT, 0);	865	const char *charset = get_property (f, XA_FONT, 0);
803		866
804	if (!charset)	867	if (!charset)
805	charset = name;	868	charset = name;
…		…
808	while (*charset)	871	while (*charset)
809	if (*charset++ == '-' && !--count)	872	if (*charset++ == '-' && !--count)
810	break;	873	break;
811		874
812	cs = codeset_from_name (charset);	875	cs = codeset_from_name (charset);
		876	if (cs == CS_UNKNOWN)
		877	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		878	}
		879
		880	if (cs == CS_UNKNOWN)
813	}	881	{
814		882	clear ();
815	free (registry);	883	return false;
816	free (encoding);	884	}
817		885
818	if (cs == CS_UNICODE)	886	if (cs == CS_UNICODE)
819	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	887	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
820		888
821	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	889	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
833	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	901	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
834		902
835	if (encm)	903	if (encm)
836	N += (f->max_byte1 - f->min_byte1)	904	N += (f->max_byte1 - f->min_byte1)
837	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	905	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
838		906
839	while (N)	907	while (N)
840	{	908	{
841	if (f->per_char[N].width > width)	909	if (f->per_char[N].width > width)
842	width = f->per_char[N].width;	910	width = f->per_char[N].width;
843		911
…		…
868	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	936	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
869		937
870	if (width < g.width) width = g.width;	938	if (width < g.width) width = g.width;
871	}	939	}
872		940
873	if (cs == CS_UNKNOWN)	941	#if 0 // do it per-character
		942	if (prop && width > prop->width)
874	{	943	{
875	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
876
877	clear ();	944	clear ();
878	return false;	945	return false;
879	}	946	}
880
881	#if 0 // do it per-character
882	if (prop && width > prop->width)
883	{
884	clear ();
885	return false;
886	}
887	#endif	947	#endif
888		948
889	return true;	949	return true;
890	}	950	}
891		951
…		…
905	uint32_t ch = FROM_UNICODE (cs, unicode);	965	uint32_t ch = FROM_UNICODE (cs, unicode);
906		966
907	if (ch == NOCHAR)	967	if (ch == NOCHAR)
908	return false;	968	return false;
909		969
910	/* check wether the character exists in _this_ font. horrible. */	970	/* check whether the character exists in _this_ font. horrible. */
911	XCharStruct *xcs;	971	XCharStruct *xcs;
912		972
913	if (encm)	973	if (encm)
914	{	974	{
915	unsigned char byte1 = ch >> 8;	975	unsigned char byte1 = ch >> 8;
…		…
945	return false;	1005	return false;
946		1006
947	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1007	if (!prop \|\| prop->width == rxvt_fontprop::unset)
948	return true;	1008	return true;
949		1009
950	// check wether character overlaps previous/next character	1010	// check whether character overlaps previous/next character
951	int w = xcs->rbearing - xcs->lbearing;	1011	int w = xcs->rbearing - xcs->lbearing;
952	int wcw = max (WCWIDTH (unicode), 1);	1012	int wcw = max (WCWIDTH (unicode), 1);
953		1013
954	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1014	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
955		1015
…		…
995	else	1055	else
996	{	1056	{
997	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1057	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
998		1058
999	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1059	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1000		1060
1001	if (slow)	1061	if (slow)
1002	{	1062	{
1003	do	1063	do
1004	{	1064	{
1005	if (xc->byte1 \|\| xc->byte2)	1065	if (xc->byte1 \|\| xc->byte2)
…		…
1027	else	1087	else
1028	{	1088	{
1029	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1089	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1030		1090
1031	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1091	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1032		1092
1033	if (slow)	1093	if (slow)
1034	{	1094	{
1035	do	1095	do
1036	{	1096	{
1037	if (*xc)	1097	if (*xc)
…		…
1057		1117
1058	void clear ();	1118	void clear ();
1059		1119
1060	rxvt_fontprop properties ();	1120	rxvt_fontprop properties ();
1061		1121
1062	bool load (const rxvt_fontprop &prop);	1122	bool load (const rxvt_fontprop &prop, bool force_prop);
1063		1123
1064	void draw (rxvt_drawable &d, int x, int y,	1124	void draw (rxvt_drawable &d, int x, int y,
1065	const text_t *text, int len,	1125	const text_t *text, int len,
1066	int fg, int bg);	1126	int fg, int bg);
1067		1127
1068	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1128	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1069		1129
1070	protected:	1130	protected:
1071	XftFont *f;	1131	XftFont *f;
1072	};	1132	};
1073		1133
…		…
1100		1160
1101	return p;	1161	return p;
1102	}	1162	}
1103		1163
1104	bool	1164	bool
1105	rxvt_font_xft::load (const rxvt_fontprop &prop)	1165	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1106	{	1166	{
1107	dTermDisplay;	1167	dTermDisplay;
1108		1168
1109	clear ();	1169	clear ();
1110		1170
…		…
1119	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1179	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1120	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1180	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1121	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1181	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1122		1182
1123	if (prop.weight != rxvt_fontprop::unset	1183	if (prop.weight != rxvt_fontprop::unset
1124	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1184	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1125	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1185	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1126		1186
1127	if (prop.slant != rxvt_fontprop::unset	1187	if (prop.slant != rxvt_fontprop::unset
1128	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1188	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1129	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1189	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1130		1190
1131	#if 0 // clipping unfortunately destroys our precious double-width-characters	1191	#if 0 // clipping unfortunately destroys our precious double-width-characters
1132	// clip width, we can't do better, or can we?	1192	// clip width, we can't do better, or can we?
1133	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1193	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1134	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1194	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1135	#endif	1195	#endif
1136		1196
1137	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1197	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1138	FcPatternAddBool (p, FC_MINSPACE, 1);	1198	FcPatternAddBool (p, FC_MINSPACE, 1);
1139		1199
…		…
1282	void	1342	void
1283	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1343	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1284	const text_t *text, int len,	1344	const text_t *text, int len,
1285	int fg, int bg)	1345	int fg, int bg)
1286	{	1346	{
1287	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1288
1289	XGlyphInfo extents;	1347	XGlyphInfo extents;
1290	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1348	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1291	XftGlyphSpec *ep = enc;	1349	XftGlyphSpec *ep = enc;
1292		1350
1293	dTermDisplay;	1351	dTermDisplay;
1294	dTermGC;	1352	dTermGC;
		1353
		1354	int w = term->fwidth * len;
		1355	int h = term->fheight;
		1356
		1357	bool buffered = bg >= Color_transparent
		1358	&& term->option (Opt_buffered);
1295		1359
1296	// cut trailing spaces	1360	// cut trailing spaces
1297	while (len && text [len - 1] == ' ')	1361	while (len && text [len - 1] == ' ')
1298	len--;	1362	len--;
1299		1363
		1364	int x_ = buffered ? 0 : x;
		1365	int y_ = buffered ? 0 : y;
		1366
1300	while (len)	1367	while (len)
1301	{	1368	{
1302	int cwidth = term->fwidth;	1369	int cwidth = term->fwidth;
1303	FcChar32 fc = *text++; len--;	1370	FcChar32 fc = *text++; len--;
1304		1371
1305	while (len && *text == NOCHAR)	1372	while (len && *text == NOCHAR)
1306	text++, len--, cwidth += term->fwidth;	1373	text++, len--, cwidth += term->fwidth;
1307		1374
1308	if (fc != ' ') // skip spaces	1375	if (fc != ' ') // skip spaces
1309	{	1376	{
1310	FT_UInt glyph = XftCharIndex (disp, f, fc);	1377	FT_UInt glyph = XftCharIndex (disp, f, fc);
1311	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1378	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1312		1379
1313	ep->glyph = glyph;	1380	ep->glyph = glyph;
1314	ep->x = x + (cwidth - extents.xOff >> 1);	1381	ep->x = x_ + (cwidth - extents.xOff >> 1);
1315	ep->y = y + ascent;	1382	ep->y = y_ + ascent;
1316		1383
1317	if (extents.xOff == 0)	1384	if (extents.xOff == 0)
1318	ep->x = x + cwidth;	1385	ep->x = x_ + cwidth;
1319		1386
1320	ep++;	1387	ep++;
1321	}	1388	}
1322		1389
1323	x += cwidth;	1390	x_ += cwidth;
		1391	}
		1392
		1393	if (buffered)
1324	}	1394	{
1325
1326	if (ep != enc)	1395	if (ep != enc)
		1396	{
		1397	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
		1398
		1399	#ifdef HAVE_BG_PIXMAP
		1400	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1401
		1402	if (term->bgPixmap.pixmap
		1403	&& (bg == Color_transparent \|\| bg == Color_bg
		1404	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
		1405	{
		1406	int src_x = x, src_y = y;
		1407
		1408	if (term->bgPixmap.is_parentOrigin ())
		1409	{
		1410	src_x += term->window_vt_x;
		1411	src_y += term->window_vt_y;
		1412	}
		1413
		1414	if (term->bgPixmap.pmap_width >= src_x + w
		1415	&& term->bgPixmap.pmap_height >= src_y + h)
		1416	{
		1417	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1418	src_x, src_y, w, h, 0, 0);
		1419	}
		1420	else
		1421	{
		1422	XGCValues gcv;
		1423
		1424	gcv.fill_style = FillTiled;
		1425	gcv.tile = term->bgPixmap.pixmap;
		1426	gcv.ts_x_origin = -src_x;
		1427	gcv.ts_y_origin = -src_y;
		1428
		1429	XChangeGC (disp, gc,
		1430	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1431	&gcv);
		1432
		1433	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1434
		1435	gcv.fill_style = FillSolid;
		1436	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1437	}
		1438
		1439	if (dst)
		1440	{
		1441	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1442
		1443	// dst can only be set when bg >= 0
		1444	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1445	}
		1446	}
		1447	else
		1448	#endif
		1449	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
		1450
		1451	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
		1452	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
		1453	}
		1454	else
		1455	clear_rect (d, x, y, w, h, bg);
		1456	}
		1457	else
		1458	{
		1459	clear_rect (d, x, y, w, h, bg);
1327	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);	1460	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
		1461	}
1328	}	1462	}
		1463
1329	#endif	1464	#endif
1330		1465
1331	/////////////////////////////////////////////////////////////////////////////	1466	/////////////////////////////////////////////////////////////////////////////
1332		1467
1333	rxvt_fontset::rxvt_fontset (rxvt_term *term)	1468	rxvt_fontset::rxvt_fontset (rxvt_term *term)
…		…
1344	void	1479	void
1345	rxvt_fontset::clear ()	1480	rxvt_fontset::clear ()
1346	{	1481	{
1347	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1482	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1348	= rxvt_fontprop::unset;	1483	= rxvt_fontprop::unset;
		1484	force_prop = false;
1349		1485
1350	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1486	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1351	FONT_UNREF (*i);	1487	FONT_UNREF (*i);
1352		1488
1353	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1489	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1358	fonts.clear ();	1494	fonts.clear ();
1359		1495
1360	fallback = fallback_fonts;	1496	fallback = fallback_fonts;
1361	}	1497	}
1362		1498
		1499	void
		1500	rxvt_fontset::prepare_font (rxvt_font *font, codeset cs)
		1501	{
		1502	font->set_term (term);
		1503
		1504	font->cs = cs;
		1505	font->loaded = false;
		1506	}
		1507
1363	rxvt_font *	1508	rxvt_font *
1364	rxvt_fontset::new_font (const char *name, codeset cs)	1509	rxvt_fontset::new_font (const char *name, codeset cs)
1365	{	1510	{
1366	rxvt_font *f;	1511	rxvt_font *f;
1367		1512
1368	if (!name \|\| !*name)	1513	if (!name \|\| !*name)
1369	{	1514	{
1370	name = "";	1515	name = "";
1371	f = new rxvt_font_default (this);	1516	f = new rxvt_font_default (this);
1372	}	1517	}
…		…
1383	f = new rxvt_font_x11;	1528	f = new rxvt_font_x11;
1384	}	1529	}
1385	else	1530	else
1386	f = new rxvt_font_x11;	1531	f = new rxvt_font_x11;
1387		1532
1388	f->set_term (term);
1389	f->set_name (strdup (name));	1533	f->set_name (strdup (name));
1390		1534	prepare_font (f, cs);
1391	f->cs = cs;
1392	f->loaded = false;
1393		1535
1394	return f;	1536	return f;
1395	}	1537	}
1396		1538
1397	/////////////////////////////////////////////////////////////////////////////	1539	/////////////////////////////////////////////////////////////////////////////
		1540
		1541	void
		1542	rxvt_fontset::push_font (rxvt_font *font)
		1543	{
		1544	// the fontCount index is reserved for the overflow font, it is only
		1545	// necessary when we get fontCount or more fonts, as they cannot be
		1546	// represented in the rendition.
		1547	if (fonts.size () == fontCount)
		1548	{
		1549	rxvt_font *f = new rxvt_font_overflow (this);
		1550
		1551	prepare_font (f, CS_UNICODE);
		1552	fonts.push_back (f);
		1553	}
		1554
		1555	fonts.push_back (font);
		1556	}
1398		1557
1399	void	1558	void
1400	rxvt_fontset::add_fonts (const char *desc)	1559	rxvt_fontset::add_fonts (const char *desc)
1401	{	1560	{
1402	if (desc)	1561	if (desc)
…		…
1440	if (!end)	1599	if (!end)
1441	end = desc + strlen (desc);	1600	end = desc + strlen (desc);
1442		1601
1443	if (end - desc < 511)	1602	if (end - desc < 511)
1444	{	1603	{
1445	strncpy (buf, desc, end - desc);	1604	memcpy (buf, desc, end - desc);
1446	buf[end - desc] = 0;	1605	buf[end - desc] = 0;
1447		1606
1448	fonts.push_back (new_font (buf, cs));	1607	push_font (new_font (buf, cs));
1449	}	1608	}
1450	else	1609	else
1451	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1610	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1452		1611
1453	desc = end + 1;	1612	desc = end + 1;
…		…
1465	if (fonts[i]->loaded)	1624	if (fonts[i]->loaded)
1466	return true;	1625	return true;
1467		1626
1468	fonts[i]->loaded = true;	1627	fonts[i]->loaded = true;
1469		1628
1470	if (!fonts[i]->load (prop))	1629	if (!fonts[i]->load (prop, force_prop))
1471	{	1630	{
1472	fonts[i]->cs = CS_UNKNOWN;	1631	fonts[i]->cs = CS_UNKNOWN;
1473	return false;	1632	return false;
1474	}	1633	}
1475		1634
…		…
1481	{	1640	{
1482	clear ();	1641	clear ();
1483		1642
1484	fontdesc = strdup (desc);	1643	fontdesc = strdup (desc);
1485		1644
1486	fonts.push_back (new_font (0, CS_UNICODE));	1645	push_font (new_font (0, CS_UNICODE));
1487	realize_font (0);	1646	realize_font (0);
1488		1647
1489	add_fonts (desc);	1648	add_fonts (desc);
1490		1649
1491	return true;	1650	return true;
…		…
1500		1659
1501	return -1;	1660	return -1;
1502	}	1661	}
1503		1662
1504	int	1663	int
1505	rxvt_fontset::find_font (unicode_t unicode)	1664	rxvt_fontset::find_font_idx (unicode_t unicode)
1506	{	1665	{
1507	if (unicode >= 1<<20)	1666	if (unicode >= 1<<20)
1508	return 0;	1667	return 0;
1509		1668
1510	unicode_t hi = unicode >> 8;	1669	unicode_t hi = unicode >> 8;
…		…
1536	goto next_font;	1695	goto next_font;
1537		1696
1538	bool careful;	1697	bool careful;
1539	if (f->has_char (unicode, &prop, careful))	1698	if (f->has_char (unicode, &prop, careful))
1540	{	1699	{
1541	if (careful)	1700	i = (i << 1) \| careful;
1542	i \|= 128;
1543		1701
1544	goto found;	1702	goto found;
1545	}	1703	}
1546		1704
1547	next_font:	1705	next_font:
1548	if (i == fonts.size () - 1)	1706	if (i == fonts.size () - 1)
1549	{	1707	{
1550	if (fallback->name)	1708	if (fallback->name)
1551	{	1709	{
1552	// search through the fallback list	1710	// search through the fallback list
1553	fonts.push_back (new_font (fallback->name, fallback->cs));	1711	push_font (new_font (fallback->name, fallback->cs));
1554	fallback++;	1712	fallback++;
1555	}	1713	}
1556	else	1714	else
1557	{	1715	{
1558	// try to find a new font.	1716	// try to find a new font.
…		…
1589	FcPatternDestroy (match);	1747	FcPatternDestroy (match);
1590		1748
1591	if (find_font (font) < 0)	1749	if (find_font (font) < 0)
1592	{	1750	{
1593	char fontname[4096];	1751	char fontname[4096];
1594	sprintf (fontname, "xft:%-.4090s", font);	1752	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1595		1753
1596	fonts.push_back (new_font (fontname, CS_UNICODE));	1754	push_font (new_font (fontname, CS_UNICODE));
1597	}	1755	}
1598		1756
1599	free (font);	1757	free (font);
1600	}	1758	}
1601	#endif	1759	#endif
…		…
1623	}	1781	}
1624		1782
1625	return i;	1783	return i;
1626	}	1784	}
1627		1785
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.163 by root, Wed Mar 31 23:01:51 2010 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.163 by root, Wed Mar 31 23:01:51 2010 UTC