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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs.
Revision 1.162 by root, Wed Mar 31 22:46:40 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
…		…
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" },
…		…
217	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)	216	: name(0), width(rxvt_fontprop::unset), height(rxvt_fontprop::unset)
218	{	217	{
219	}	218	}
220		219
221	void	220	void
222	rxvt_font::set_name (char *name)	221	rxvt_font::set_name (char *name_)
223	{	222	{
224	if (this->name == name)	223	if (name == name_)
225	return;	224	return;
226		225
227	if (this->name) free (this->name); // let the compiler optimize	226	if (name) free (name); // let the compiler optimize
228	this->name = name;	227	name = name_;
229	}	228	}
230		229
231	void	230	void
232	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
233	{	232	{
234	dTermDisplay;	233	dTermDisplay;
235	dTermGC;	234	dTermGC;
236		235
237	if (color < 0 \|\| color == Color_bg)	236	if (color == Color_bg \|\| color == Color_transparent)
238	XClearArea (disp, d, x, y, w, h, false);	237	XClearArea (disp, d, x, y, w, h, false);
239	else	238	else if (color >= 0)
240	{	239	{
241	#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
242	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);	255	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
		256
243	#else	257	#else
244	XSetForeground (disp, gc, term->pix_colors[color]);	258	XSetForeground (disp, gc, term->pix_colors[color]);
245	XFillRectangle (disp, d, gc, x, y, w, h);	259	XFillRectangle (disp, d, gc, x, y, w, h);
246	#endif	260	#endif
247	}	261	}
248	}	262	}
249		263
250	/////////////////////////////////////////////////////////////////////////////	264	/////////////////////////////////////////////////////////////////////////////
251
252	#include "table/linedraw.h"
253		265
254	struct rxvt_font_default : rxvt_font {	266	struct rxvt_font_default : rxvt_font {
255	struct rxvt_fontset *fs;	267	struct rxvt_fontset *fs;
256		268
257	rxvt_font_default (rxvt_fontset *fs)	269	rxvt_font_default (rxvt_fontset *fs)
…		…
270	p.slant = rxvt_fontprop::roman;	282	p.slant = rxvt_fontprop::roman;
271		283
272	return p;	284	return p;
273	}	285	}
274		286
275	bool load (const rxvt_fontprop &prop)	287	bool load (const rxvt_fontprop &prop, bool force_prop)
276	{	288	{
277	width = 1; height = 1;	289	width = 1; height = 1;
278	ascent = 1; descent = 0;	290	ascent = 1; descent = 0;
279		291
280	set_name (strdup ("built-in support font"));	292	set_name (strdup ("built-in support font"));
…		…
293	return false;	305	return false;
294		306
295	if (unicode <= 0x009f)	307	if (unicode <= 0x009f)
296	return true;	308	return true;
297		309
		310	#ifdef BUILTIN_GLYPHS
298	if (unicode >= 0x2500 && unicode <= 0x259f &&	311	if (unicode >= 0x2500 && unicode <= 0x259f &&
299	!term->option (Opt_skipBuiltinGlyphs))	312	!term->option (Opt_skipBuiltinGlyphs))
300	return true;	313	return true;
		314	#endif
301		315
302	if (IS_COMPOSE (unicode))	316	if (IS_COMPOSE (unicode))
303	return true;	317	return true;
304		318
305	switch (unicode)	319	switch (unicode)
…		…
341	;	355	;
342		356
343	int width = text - tp;	357	int width = text - tp;
344	int fwidth = term->fwidth * width;	358	int fwidth = term->fwidth * width;
345		359
		360	#ifdef BUILTIN_GLYPHS
346	if (0x2500 <= t && t <= 0x259f)	361	if (0x2500 <= t && t <= 0x259f)
347	{	362	{
		363	# include "table/linedraw.h"
348	uint16_t offs = linedraw_offs[t - 0x2500];	364	uint16_t offs = linedraw_offs[t - 0x2500];
349	uint32_t *a = linedraw_command + (offs >> 4);	365	uint32_t *a = linedraw_command + (offs >> 4);
350	uint32_t *b = a + (offs & 15);	366	uint32_t *b = a + (offs & 15);
351		367
352	int W = fwidth;	368	int W = fwidth;
…		…
390		406
391	case 1: // rectangle, possibly stippled	407	case 1: // rectangle, possibly stippled
392	if (a)	408	if (a)
393	{	409	{
394	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	410	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
395		411
396	gcv.fill_style = FillStippled;	412	gcv.fill_style = FillStippled;
397	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	413	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
398	gcv.ts_x_origin = x;	414	gcv.ts_x_origin = x;
399	gcv.ts_y_origin = y;	415	gcv.ts_y_origin = y;
400		416
…		…
419	(a - 1) * 9064, (b - 1) 90*64);	435	(a - 1) * 9064, (b - 1) 90*64);
420	break;	436	break;
421	}	437	}
422	}	438	}
423	}	439	}
		440	#else
		441	if (0)
		442	;
		443	#endif
424	#if ENABLE_COMBINING	444	#if ENABLE_COMBINING
425	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	445	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
426	{	446	{
427	min_it (width, 2); // we only support wcwidth up to 2	447	min_it (width, 2); // we only support wcwidth up to 2
428		448
…		…
441	*chrs = cc->c2;	461	*chrs = cc->c2;
442	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)	462	rxvt_font *f2 = (f1->has_char (cc->c2, 0, careful) && !careful)
443	? f1	463	? f1
444	: (*fs)[fs->find_font (cc->c2)];	464	: (*fs)[fs->find_font (cc->c2)];
445		465
446	f2->draw (d, x, y, chrs, width, fg, -1);	466	f2->draw (d, x, y, chrs, width, fg, Color_none);
447	}	467	}
448	}	468	}
449	#endif	469	#endif
450	else	470	else
451	switch (t)	471	switch (t)
…		…
462		482
463	x += fwidth;	483	x += fwidth;
464	}	484	}
465	}	485	}
466		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
467	/////////////////////////////////////////////////////////////////////////////	537	/////////////////////////////////////////////////////////////////////////////
468		538
469	struct rxvt_font_x11 : rxvt_font {	539	struct rxvt_font_x11 : rxvt_font {
470	rxvt_font_x11 () { f = 0; }	540	rxvt_font_x11 () { f = 0; }
471		541
472	void clear ();	542	void clear ();
473		543
474	rxvt_fontprop properties ();	544	rxvt_fontprop properties ();
475		545
476	bool load (const rxvt_fontprop &prop);	546	bool load (const rxvt_fontprop &prop, bool force_prop);
477		547
478	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;
479		549
480	void draw (rxvt_drawable &d, int x, int y,	550	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	551	const text_t *text, int len,
482	int fg, int bg);	552	int fg, int bg);
483		553
484	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
485	XFontStruct *f;	555	XFontStruct *f;
486	codeset cs;
487	bool enc2b, encm;	556	bool enc2b, encm;
488		557
489	char get_property (XFontStruct f, Atom property, const char *repl) const;	558	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);	559	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);	560	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
498	unsigned long value;	567	unsigned long value;
499		568
500	if (XGetFontProperty (f, property, &value))	569	if (XGetFontProperty (f, property, &value))
501	return XGetAtomName (term->dpy, value);	570	return XGetAtomName (term->dpy, value);
502	else	571	else
503	return rxvt_strdup (repl);	572	return repl ? strdup (repl) : 0;
504	}	573	}
505		574
506	rxvt_fontprop	575	rxvt_fontprop
507	rxvt_font_x11::properties ()	576	rxvt_font_x11::properties ()
508	{	577	{
…		…
590	return false;	659	return false;
591	}	660	}
592		661
593	// fix the size of scalable fonts	662	// fix the size of scalable fonts
594	static bool	663	static bool
595	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)
596	{	665	{
597	int slashes = 0;	666	int slashes = 0;
598	const char field, end;	667	const char field, end;
599		668
600	for (const char c = name; c; c++)	669	for (const char c = name; c; c++)
…		…
610	break;	679	break;
611	}	680	}
612		681
613	if (slashes >= 13 && (!old \|\| *field == old))	682	if (slashes >= 13 && (!old \|\| *field == old))
614	{	683	{
615	// TODO: check for overflow in font-name	684	size_t len = field - name;
616	strncpy (buf, name, field - name);	685	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
617	buf += field - name;	686	memcpy (*ptr, name, len);
618	strcpy (buf, replace);	687	strcpy (*ptr + len, replace);
619	strcat (buf, end);	688	strcat (*ptr, end);
620		689
621	return true;	690	return true;
622	}	691	}
623	else	692	else
624	{	693	{
625	strcpy (buf, name);	694	*ptr = strdup (name);
626		695
627	return false;	696	return false;
628	}	697	}
629	}	698	}
630		699
631	bool	700	bool
632	rxvt_font_x11::load (const rxvt_fontprop &prop)	701	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633	{	702	{
634	dTermDisplay;	703	dTermDisplay;
635		704
636	clear ();	705	clear ();
637		706
638	char field_str[64]; // enough for 128 bits	707	char field_str[64]; // enough for 128 bits
639		708
640	// first morph the font if required	709	// first morph the font if required
641	if (prop.weight != rxvt_fontprop::unset	710	if (force_prop)
642	\|\| prop.slant != rxvt_fontprop::unset)
643	{	711	{
644	char fname[1024];	712	char *fname;
645		713
646	if (name[0] != '-')	714	if (name[0] != '-')
647	{	715	{
648	f = XLoadQueryFont (disp, name);	716	f = XLoadQueryFont (disp, name);
649		717
…		…
661	f = 0;	729	f = 0;
662	}	730	}
663		731
664	if (prop.weight != rxvt_fontprop::unset)	732	if (prop.weight != rxvt_fontprop::unset)
665	{	733	{
666	replace_field (fname, name, 2, 0,	734	replace_field (&fname, name, 2, 0,
667	prop.weight < rxvt_fontprop::bold	735	prop.weight < rxvt_fontprop::bold
668	? "medium" : "bold");	736	? "medium" : "bold");
669	set_name (strdup (fname));	737	set_name (fname);
670	}	738	}
671		739
672	if (prop.slant != rxvt_fontprop::unset)	740	if (prop.slant != rxvt_fontprop::unset)
673	{	741	{
674	replace_field (fname, name, 3, 0,	742	replace_field (&fname, name, 3, 0,
675	prop.slant < rxvt_fontprop::italic	743	prop.slant < rxvt_fontprop::italic
676	? "r" : "i"); // TODO: handle "o"blique, too	744	? "r" : "i"); // TODO: handle "o"blique, too
677	set_name (strdup (fname));	745	set_name (fname);
678	}	746	}
679	}	747	}
680		748
681	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	749	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682	? 0 : prop.height);	750	? 0 : prop.height);
…		…
707	font_weight *fonts = new font_weight[count];	775	font_weight *fonts = new font_weight[count];
708		776
709	for (int i = 0; i < count; i++)	777	for (int i = 0; i < count; i++)
710	{	778	{
711	rxvt_fontprop p;	779	rxvt_fontprop p;
712	char fname[1024];	780	char *fname;
713		781
714	int diff = 0;	782	int diff = 0;
715		783
716	if (replace_field (fname, list[i], 6, '0', field_str))	784	if (replace_field (&fname, list[i], 6, '0', field_str))
717	diff += 10; // slightly penalize scalable fonts	785	diff += 10; // slightly penalize scalable fonts
		786	else
		787	{
		788	free (fname);
718	else if (replace_field (fname, list[i], 11, '0', "0"))	789	if (replace_field (&fname, list[i], 11, '0', "0"))
719	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	790	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		791	}
720		792
721	if (!set_properties (p, fname))	793	if (!set_properties (p, fname))
722	continue;	794	continue;
723		795
724	if (prop.height != rxvt_fontprop::unset	796	if (prop.height != rxvt_fontprop::unset
…		…
728	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;
729	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);
730	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);
731	//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);
732		804
733	fonts[i].name = strdup (fname);	805	fonts[i].name = fname;
734	fonts[i].diff = diff;	806	fonts[i].diff = diff;
735	}	807	}
736		808
737	XFreeFontNames (list);	809	XFreeFontNames (list);
738		810
…		…
770	return false;	842	return false;
771		843
772	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	844	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	845	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774		846
		847	cs = CS_UNKNOWN;
		848
775	if (registry && encoding)	849	if (registry && encoding)
776	{	850	{
777	char charset[64];	851	char charset[64];
778	snprintf (charset, 64, "%s-%s", registry, encoding);	852	snprintf (charset, 64, "%s-%s", registry, encoding);
779		853
780	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);
781	}	858	}
782	else	859
		860	free (registry);
		861	free (encoding);
		862
		863	if (cs == CS_UNKNOWN)
783	{	864	{
784	const char *charset = get_property (f, XA_FONT, 0);	865	const char *charset = get_property (f, XA_FONT, 0);
785		866
786	if (!charset)	867	if (!charset)
787	charset = name;	868	charset = name;
…		…
790	while (*charset)	871	while (*charset)
791	if (*charset++ == '-' && !--count)	872	if (*charset++ == '-' && !--count)
792	break;	873	break;
793		874
794	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)
795	}	881	{
796		882	clear ();
797	free (registry);	883	return false;
798	free (encoding);	884	}
799		885
800	if (cs == CS_UNICODE)	886	if (cs == CS_UNICODE)
801	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
802		888
803	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	889	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
815	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;
816		902
817	if (encm)	903	if (encm)
818	N += (f->max_byte1 - f->min_byte1)	904	N += (f->max_byte1 - f->min_byte1)
819	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	905	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820		906
821	while (N)	907	while (N)
822	{	908	{
823	if (f->per_char[N].width > width)	909	if (f->per_char[N].width > width)
824	width = f->per_char[N].width;	910	width = f->per_char[N].width;
825		911
…		…
850	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	936	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851		937
852	if (width < g.width) width = g.width;	938	if (width < g.width) width = g.width;
853	}	939	}
854		940
855	if (cs == CS_UNKNOWN)	941	#if 0 // do it per-character
		942	if (prop && width > prop->width)
856	{	943	{
857	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858
859	clear ();	944	clear ();
860	return false;	945	return false;
861	}	946	}
862
863	#if 0 // do it per-character
864	if (prop && width > prop->width)
865	{
866	clear ();
867	return false;
868	}
869	#endif	947	#endif
870		948
871	return true;	949	return true;
872	}	950	}
873		951
…		…
887	uint32_t ch = FROM_UNICODE (cs, unicode);	965	uint32_t ch = FROM_UNICODE (cs, unicode);
888		966
889	if (ch == NOCHAR)	967	if (ch == NOCHAR)
890	return false;	968	return false;
891		969
892	/* check wether the character exists in _this_ font. horrible. */	970	/* check whether the character exists in _this_ font. horrible. */
893	XCharStruct *xcs;	971	XCharStruct *xcs;
894		972
895	if (encm)	973	if (encm)
896	{	974	{
897	unsigned char byte1 = ch >> 8;	975	unsigned char byte1 = ch >> 8;
…		…
927	return false;	1005	return false;
928		1006
929	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1007	if (!prop \|\| prop->width == rxvt_fontprop::unset)
930	return true;	1008	return true;
931		1009
932	// check wether character overlaps previous/next character	1010	// check whether character overlaps previous/next character
933	int w = xcs->rbearing - xcs->lbearing;	1011	int w = xcs->rbearing - xcs->lbearing;
934	int wcw = max (WCWIDTH (unicode), 1);	1012	int wcw = max (WCWIDTH (unicode), 1);
935		1013
936	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;	1014	careful = xcs->lbearing < 0 \|\| xcs->rbearing > prop->width * wcw;
937		1015
…		…
977	else	1055	else
978	{	1056	{
979	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1057	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980		1058
981	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1059	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
982		1060
983	if (slow)	1061	if (slow)
984	{	1062	{
985	do	1063	do
986	{	1064	{
987	if (xc->byte1 \|\| xc->byte2)	1065	if (xc->byte1 \|\| xc->byte2)
…		…
1009	else	1087	else
1010	{	1088	{
1011	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1089	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012		1090
1013	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1091	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1014		1092
1015	if (slow)	1093	if (slow)
1016	{	1094	{
1017	do	1095	do
1018	{	1096	{
1019	if (*xc)	1097	if (*xc)
…		…
1039		1117
1040	void clear ();	1118	void clear ();
1041		1119
1042	rxvt_fontprop properties ();	1120	rxvt_fontprop properties ();
1043		1121
1044	bool load (const rxvt_fontprop &prop);	1122	bool load (const rxvt_fontprop &prop, bool force_prop);
1045		1123
1046	void draw (rxvt_drawable &d, int x, int y,	1124	void draw (rxvt_drawable &d, int x, int y,
1047	const text_t *text, int len,	1125	const text_t *text, int len,
1048	int fg, int bg);	1126	int fg, int bg);
1049		1127
1050	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;
1051		1129
1052	protected:	1130	protected:
1053	XftFont *f;	1131	XftFont *f;
1054	};	1132	};
1055		1133
…		…
1082		1160
1083	return p;	1161	return p;
1084	}	1162	}
1085		1163
1086	bool	1164	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1165	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088	{	1166	{
1089	dTermDisplay;	1167	dTermDisplay;
1090		1168
1091	clear ();	1169	clear ();
1092		1170
…		…
1101	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1179	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1180	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1181	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1182
1105	if (prop.weight != rxvt_fontprop::unset	1183	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1184	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1185	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108		1186
1109	if (prop.slant != rxvt_fontprop::unset	1187	if (prop.slant != rxvt_fontprop::unset
1110	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1188	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1189	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112		1190
1113	#if 0 // clipping unfortunately destroys our precious double-width-characters	1191	#if 0 // clipping unfortunately destroys our precious double-width-characters
1114	// clip width, we can't do better, or can we?	1192	// clip width, we can't do better, or can we?
1115	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1193	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1194	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117	#endif	1195	#endif
1118		1196
1119	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1197	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120	FcPatternAddBool (p, FC_MINSPACE, 1);	1198	FcPatternAddBool (p, FC_MINSPACE, 1);
1121		1199
…		…
1265	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1343	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1266	const text_t *text, int len,	1344	const text_t *text, int len,
1267	int fg, int bg)	1345	int fg, int bg)
1268	{	1346	{
1269	XGlyphInfo extents;	1347	XGlyphInfo extents;
1270	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1348	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1271	XftGlyphSpec *ep = enc;	1349	XftGlyphSpec *ep = enc;
1272		1350
1273	dTermDisplay;	1351	dTermDisplay;
1274	dTermGC;	1352	dTermGC;
1275		1353
1276	int w = term->fwidth * len;	1354	int w = term->fwidth * len;
1277	int h = term->fheight;	1355	int h = term->fheight;
1278		1356
1279	bool buffered = 0	1357	bool buffered = bg >= Color_transparent
1280	#ifndef FORCE_UNBUFFERED_XFT	1358	&& term->option (Opt_buffered);
1281	# if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)
1282	\|\| !term->am_transparent // we aren't transparent
1283	\|\| term->am_pixmap_trans // we have a pixmap
1284	# endif
1285	\|\| bg >= 0; // we don't use a transparent bg
1286	#endif
1287		1359
1288	// cut trailing spaces	1360	// cut trailing spaces
1289	while (len && text [len - 1] == ' ')	1361	while (len && text [len - 1] == ' ')
1290	len--;	1362	len--;
1291		1363
…		…
1297	int cwidth = term->fwidth;	1369	int cwidth = term->fwidth;
1298	FcChar32 fc = *text++; len--;	1370	FcChar32 fc = *text++; len--;
1299		1371
1300	while (len && *text == NOCHAR)	1372	while (len && *text == NOCHAR)
1301	text++, len--, cwidth += term->fwidth;	1373	text++, len--, cwidth += term->fwidth;
1302		1374
1303	if (fc != ' ') // skip spaces	1375	if (fc != ' ') // skip spaces
1304	{	1376	{
1305	FT_UInt glyph = XftCharIndex (disp, f, fc);	1377	FT_UInt glyph = XftCharIndex (disp, f, fc);
1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1378	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1307		1379
…		…
1322	{	1394	{
1323	if (ep != enc)	1395	if (ep != enc)
1324	{	1396	{
1325	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1397	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1326		1398
1327	#if defined(XPM_BACKGROUND) \|\| defined(TRANSPARENT)	1399	#ifdef HAVE_BG_PIXMAP
1328	if (bg < 0 && term->am_pixmap_trans)	1400	Picture dst = 0; // the only assignment is done conditionally in the following if condition
1329	XCopyArea (disp, term->pixmap, d2, gc, x, y, w, h, 0, 0);	1401
1330	else if (bg < 0 && term->bgPixmap.pixmap)	1402	if (term->bgPixmap.pixmap
		1403	&& (bg == Color_transparent \|\| bg == Color_bg
		1404	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
1331	{	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	{
1332	XGCValues gcv;	1422	XGCValues gcv;
1333		1423
1334	gcv.fill_style = FillTiled;	1424	gcv.fill_style = FillTiled;
1335	gcv.tile = term->pixmap;	1425	gcv.tile = term->bgPixmap.pixmap;
1336	gcv.ts_x_origin = -x;	1426	gcv.ts_x_origin = -src_x;
1337	gcv.ts_y_origin = -y;	1427	gcv.ts_y_origin = -src_y;
1338		1428
1339	GC gc2 = XCreateGC (disp, d2,	1429	XChangeGC (disp, gc,
1340	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,	1430	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
1341	&gcv);	1431	&gcv);
1342		1432
1343	XFillRectangle (disp, d2, gc2, 0, 0, w, h);	1433	XFillRectangle (disp, d2, gc, 0, 0, w, h);
1344		1434
1345	XFreeGC (disp, gc2);	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	}
1346	}	1446	}
1347	else	1447	else
1348	#endif	1448	#endif
1349	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1449	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1350		1450
1351	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1451	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1352	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1452	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1353	}	1453	}
1354	else	1454	else
…		…
1379	void	1479	void
1380	rxvt_fontset::clear ()	1480	rxvt_fontset::clear ()
1381	{	1481	{
1382	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1482	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1383	= rxvt_fontprop::unset;	1483	= rxvt_fontprop::unset;
		1484	force_prop = false;
1384		1485
1385	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1486	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1386	FONT_UNREF (*i);	1487	FONT_UNREF (*i);
1387		1488
1388	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1489	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1393	fonts.clear ();	1494	fonts.clear ();
1394		1495
1395	fallback = fallback_fonts;	1496	fallback = fallback_fonts;
1396	}	1497	}
1397		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
1398	rxvt_font *	1508	rxvt_font *
1399	rxvt_fontset::new_font (const char *name, codeset cs)	1509	rxvt_fontset::new_font (const char *name, codeset cs)
1400	{	1510	{
1401	rxvt_font *f;	1511	rxvt_font *f;
1402		1512
1403	if (!name \|\| !*name)	1513	if (!name \|\| !*name)
1404	{	1514	{
1405	name = "";	1515	name = "";
1406	f = new rxvt_font_default (this);	1516	f = new rxvt_font_default (this);
1407	}	1517	}
…		…
1418	f = new rxvt_font_x11;	1528	f = new rxvt_font_x11;
1419	}	1529	}
1420	else	1530	else
1421	f = new rxvt_font_x11;	1531	f = new rxvt_font_x11;
1422		1532
1423	f->set_term (term);
1424	f->set_name (strdup (name));	1533	f->set_name (strdup (name));
1425		1534	prepare_font (f, cs);
1426	f->cs = cs;
1427	f->loaded = false;
1428		1535
1429	return f;	1536	return f;
1430	}	1537	}
1431		1538
1432	/////////////////////////////////////////////////////////////////////////////	1539	/////////////////////////////////////////////////////////////////////////////
		1540
		1541	void
		1542	rxvt_fontset::push_font (rxvt_font *font)
		1543	{
		1544	if (fonts.size () == fontCount)
		1545	{
		1546	rxvt_font *f = new rxvt_font_overflow (this);
		1547
		1548	prepare_font (f, CS_UNICODE);
		1549	fonts.push_back (f);
		1550	}
		1551
		1552	fonts.push_back (font);
		1553	}
1433		1554
1434	void	1555	void
1435	rxvt_fontset::add_fonts (const char *desc)	1556	rxvt_fontset::add_fonts (const char *desc)
1436	{	1557	{
1437	if (desc)	1558	if (desc)
…		…
1475	if (!end)	1596	if (!end)
1476	end = desc + strlen (desc);	1597	end = desc + strlen (desc);
1477		1598
1478	if (end - desc < 511)	1599	if (end - desc < 511)
1479	{	1600	{
1480	strncpy (buf, desc, end - desc);	1601	memcpy (buf, desc, end - desc);
1481	buf[end - desc] = 0;	1602	buf[end - desc] = 0;
1482		1603
1483	fonts.push_back (new_font (buf, cs));	1604	push_font (new_font (buf, cs));
1484	}	1605	}
1485	else	1606	else
1486	rxvt_warn ("fontset element too long (>511 bytes), ignored.");	1607	rxvt_warn ("fontset element too long (>511 bytes), ignored.");
1487		1608
1488	desc = end + 1;	1609	desc = end + 1;
…		…
1500	if (fonts[i]->loaded)	1621	if (fonts[i]->loaded)
1501	return true;	1622	return true;
1502		1623
1503	fonts[i]->loaded = true;	1624	fonts[i]->loaded = true;
1504		1625
1505	if (!fonts[i]->load (prop))	1626	if (!fonts[i]->load (prop, force_prop))
1506	{	1627	{
1507	fonts[i]->cs = CS_UNKNOWN;	1628	fonts[i]->cs = CS_UNKNOWN;
1508	return false;	1629	return false;
1509	}	1630	}
1510		1631
…		…
1516	{	1637	{
1517	clear ();	1638	clear ();
1518		1639
1519	fontdesc = strdup (desc);	1640	fontdesc = strdup (desc);
1520		1641
1521	fonts.push_back (new_font (0, CS_UNICODE));	1642	push_font (new_font (0, CS_UNICODE));
1522	realize_font (0);	1643	realize_font (0);
1523		1644
1524	add_fonts (desc);	1645	add_fonts (desc);
1525		1646
1526	return true;	1647	return true;
…		…
1535		1656
1536	return -1;	1657	return -1;
1537	}	1658	}
1538		1659
1539	int	1660	int
1540	rxvt_fontset::find_font (unicode_t unicode)	1661	rxvt_fontset::find_font_idx (unicode_t unicode)
1541	{	1662	{
1542	if (unicode >= 1<<20)	1663	if (unicode >= 1<<20)
1543	return 0;	1664	return 0;
1544		1665
1545	unicode_t hi = unicode >> 8;	1666	unicode_t hi = unicode >> 8;
…		…
1571	goto next_font;	1692	goto next_font;
1572		1693
1573	bool careful;	1694	bool careful;
1574	if (f->has_char (unicode, &prop, careful))	1695	if (f->has_char (unicode, &prop, careful))
1575	{	1696	{
1576	if (careful)	1697	i = (i << 1) \| careful;
1577	i \|= 128;
1578		1698
1579	goto found;	1699	goto found;
1580	}	1700	}
1581		1701
1582	next_font:	1702	next_font:
1583	if (i == fonts.size () - 1)	1703	if (i == fonts.size () - 1)
1584	{	1704	{
1585	if (fallback->name)	1705	if (fallback->name)
1586	{	1706	{
1587	// search through the fallback list	1707	// search through the fallback list
1588	fonts.push_back (new_font (fallback->name, fallback->cs));	1708	push_font (new_font (fallback->name, fallback->cs));
1589	fallback++;	1709	fallback++;
1590	}	1710	}
1591	else	1711	else
1592	{	1712	{
1593	// try to find a new font.	1713	// try to find a new font.
…		…
1624	FcPatternDestroy (match);	1744	FcPatternDestroy (match);
1625		1745
1626	if (find_font (font) < 0)	1746	if (find_font (font) < 0)
1627	{	1747	{
1628	char fontname[4096];	1748	char fontname[4096];
1629	sprintf (fontname, "xft:%-.4090s", font);	1749	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1630		1750
1631	fonts.push_back (new_font (fontname, CS_UNICODE));	1751	push_font (new_font (fontname, CS_UNICODE));
1632	}	1752	}
1633		1753
1634	free (font);	1754	free (font);
1635	}	1755	}
1636	#endif	1756	#endif
…		…
1658	}	1778	}
1659		1779
1660	return i;	1780	return i;
1661	}	1781	}
1662		1782
1663
1664

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs. Revision 1.162 by root, Wed Mar 31 22:46:40 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.99 by root, Sat Mar 4 18:42:15 2006 UTC vs.
Revision 1.162 by root, Wed Mar 31 22:46:40 2010 UTC