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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.95 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.156 by root, Tue Mar 30 23:36:14 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" },
…		…
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 == 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 if (color >= 0)	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
429	text_t chrs[2];	449	text_t chrs[2];
430	chrs [1] = NOCHAR;	450	chrs [1] = NOCHAR;
431		451
432	*chrs = cc->c1;	452	*chrs = cc->c1;
433	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	453	rxvt_font *f1 = fs->get (cc->c1);
434	f1->draw (d, x, y, chrs, width, fg, bg);	454	f1->draw (d, x, y, chrs, width, fg, bg);
435		455
436	if (cc->c2 != NOCHAR)	456	if (cc->c2 != NOCHAR)
437	{	457	{
438	bool careful;	458	bool careful;
439		459
440	// prefer font of first character, for no good reasons	460	// prefer font of first character, for no good reasons
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->get (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)
…		…
471		491
472	void clear ();	492	void clear ();
473		493
474	rxvt_fontprop properties ();	494	rxvt_fontprop properties ();
475		495
476	bool load (const rxvt_fontprop &prop);	496	bool load (const rxvt_fontprop &prop, bool force_prop);
477		497
478	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;	498	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
479		499
480	void draw (rxvt_drawable &d, int x, int y,	500	void draw (rxvt_drawable &d, int x, int y,
481	const text_t *text, int len,	501	const text_t *text, int len,
482	int fg, int bg);	502	int fg, int bg);
483		503
484	bool slow; // wether this is a proportional font or has other funny characteristics	504	bool slow; // wether this is a proportional font or has other funny characteristics
485	XFontStruct *f;	505	XFontStruct *f;
486	codeset cs;
487	bool enc2b, encm;	506	bool enc2b, encm;
488		507
489	char get_property (XFontStruct f, Atom property, const char *repl) const;	508	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);	509	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);	510	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
…		…
498	unsigned long value;	517	unsigned long value;
499		518
500	if (XGetFontProperty (f, property, &value))	519	if (XGetFontProperty (f, property, &value))
501	return XGetAtomName (term->dpy, value);	520	return XGetAtomName (term->dpy, value);
502	else	521	else
503	return rxvt_strdup (repl);	522	return repl ? strdup (repl) : 0;
504	}	523	}
505		524
506	rxvt_fontprop	525	rxvt_fontprop
507	rxvt_font_x11::properties ()	526	rxvt_font_x11::properties ()
508	{	527	{
…		…
590	return false;	609	return false;
591	}	610	}
592		611
593	// fix the size of scalable fonts	612	// fix the size of scalable fonts
594	static bool	613	static bool
595	replace_field (char buf, const char name, int index, const char old, const char *replace)	614	replace_field (char *ptr, const char name, int index, const char old, const char *replace)
596	{	615	{
597	int slashes = 0;	616	int slashes = 0;
598	const char field, end;	617	const char field, end;
599		618
600	for (const char c = name; c; c++)	619	for (const char c = name; c; c++)
…		…
610	break;	629	break;
611	}	630	}
612		631
613	if (slashes >= 13 && (!old \|\| *field == old))	632	if (slashes >= 13 && (!old \|\| *field == old))
614	{	633	{
615	// TODO: check for overflow in font-name	634	size_t len = field - name;
616	strncpy (buf, name, field - name);	635	ptr = (char )malloc (len + strlen (replace) + strlen (end) + 1);
617	buf += field - name;	636	memcpy (*ptr, name, len);
618	strcpy (buf, replace);	637	strcpy (*ptr + len, replace);
619	strcat (buf, end);	638	strcat (*ptr, end);
620		639
621	return true;	640	return true;
622	}	641	}
623	else	642	else
624	{	643	{
625	strcpy (buf, name);	644	*ptr = strdup (name);
626		645
627	return false;	646	return false;
628	}	647	}
629	}	648	}
630		649
631	bool	650	bool
632	rxvt_font_x11::load (const rxvt_fontprop &prop)	651	rxvt_font_x11::load (const rxvt_fontprop &prop, bool force_prop)
633	{	652	{
634	dTermDisplay;	653	dTermDisplay;
635		654
636	clear ();	655	clear ();
637		656
638	char field_str[64]; // enough for 128 bits	657	char field_str[64]; // enough for 128 bits
639		658
640	// first morph the font if required	659	// first morph the font if required
641	if (prop.weight != rxvt_fontprop::unset	660	if (force_prop)
642	\|\| prop.slant != rxvt_fontprop::unset)
643	{	661	{
644	char fname[1024];	662	char *fname;
645		663
646	if (name[0] != '-')	664	if (name[0] != '-')
647	{	665	{
648	f = XLoadQueryFont (disp, name);	666	f = XLoadQueryFont (disp, name);
649		667
…		…
661	f = 0;	679	f = 0;
662	}	680	}
663		681
664	if (prop.weight != rxvt_fontprop::unset)	682	if (prop.weight != rxvt_fontprop::unset)
665	{	683	{
666	replace_field (fname, name, 2, 0,	684	replace_field (&fname, name, 2, 0,
667	prop.weight < rxvt_fontprop::bold	685	prop.weight < rxvt_fontprop::bold
668	? "medium" : "bold");	686	? "medium" : "bold");
669	set_name (strdup (fname));	687	set_name (fname);
670	}	688	}
671		689
672	if (prop.slant != rxvt_fontprop::unset)	690	if (prop.slant != rxvt_fontprop::unset)
673	{	691	{
674	replace_field (fname, name, 3, 0,	692	replace_field (&fname, name, 3, 0,
675	prop.slant < rxvt_fontprop::italic	693	prop.slant < rxvt_fontprop::italic
676	? "r" : "i"); // TODO: handle "o"blique, too	694	? "r" : "i"); // TODO: handle "o"blique, too
677	set_name (strdup (fname));	695	set_name (fname);
678	}	696	}
679	}	697	}
680		698
681	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset	699	sprintf (field_str, "%d", prop.height == rxvt_fontprop::unset
682	? 0 : prop.height);	700	? 0 : prop.height);
…		…
707	font_weight *fonts = new font_weight[count];	725	font_weight *fonts = new font_weight[count];
708		726
709	for (int i = 0; i < count; i++)	727	for (int i = 0; i < count; i++)
710	{	728	{
711	rxvt_fontprop p;	729	rxvt_fontprop p;
712	char fname[1024];	730	char *fname;
713		731
714	int diff = 0;	732	int diff = 0;
715		733
716	if (replace_field (fname, list[i], 6, '0', field_str))	734	if (replace_field (&fname, list[i], 6, '0', field_str))
717	diff += 10; // slightly penalize scalable fonts	735	diff += 10; // slightly penalize scalable fonts
		736	else
		737	{
		738	free (fname);
718	else if (replace_field (fname, list[i], 11, '0', "0"))	739	if (replace_field (&fname, list[i], 11, '0', "0"))
719	diff += 300; // more heavily penalize what looks like scaled bitmap fonts	740	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
		741	}
720		742
721	if (!set_properties (p, fname))	743	if (!set_properties (p, fname))
722	continue;	744	continue;
723		745
724	if (prop.height != rxvt_fontprop::unset	746	if (prop.height != rxvt_fontprop::unset
…		…
728	if (prop.height != rxvt_fontprop::unset) diff += (prop.height - p.height) * 128;	750	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);	751	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);	752	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);	753	//if (prop.width != rxvt_fontprop::unset) diff += abs (prop.width - p.width);
732		754
733	fonts[i].name = strdup (fname);	755	fonts[i].name = fname;
734	fonts[i].diff = diff;	756	fonts[i].diff = diff;
735	}	757	}
736		758
737	XFreeFontNames (list);	759	XFreeFontNames (list);
738		760
…		…
770	return false;	792	return false;
771		793
772	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);	794	char *registry = get_property (f, term->xa [XA_CHARSET_REGISTRY], 0);
773	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);	795	char *encoding = get_property (f, term->xa [XA_CHARSET_ENCODING], 0);
774		796
		797	cs = CS_UNKNOWN;
		798
775	if (registry && encoding)	799	if (registry && encoding)
776	{	800	{
777	char charset[64];	801	char charset[64];
778	snprintf (charset, 64, "%s-%s", registry, encoding);	802	snprintf (charset, 64, "%s-%s", registry, encoding);
779		803
780	cs = codeset_from_name (charset);	804	cs = codeset_from_name (charset);
		805
		806	if (cs == CS_UNKNOWN)
		807	rxvt_warn ("%s: cannot deduce encoding from registry/encoding properties \"%s\", ignoring font.\n", name, charset);
781	}	808	}
782	else	809
		810	free (registry);
		811	free (encoding);
		812
		813	if (cs == CS_UNKNOWN)
783	{	814	{
784	const char *charset = get_property (f, XA_FONT, 0);	815	const char *charset = get_property (f, XA_FONT, 0);
785		816
786	if (!charset)	817	if (!charset)
787	charset = name;	818	charset = name;
…		…
790	while (*charset)	821	while (*charset)
791	if (*charset++ == '-' && !--count)	822	if (*charset++ == '-' && !--count)
792	break;	823	break;
793		824
794	cs = codeset_from_name (charset);	825	cs = codeset_from_name (charset);
		826	if (cs == CS_UNKNOWN)
		827	rxvt_warn ("%s: cannot deduce encoding from font name property \"%s\", ignoring font.\n", name, charset);
		828	}
		829
		830	if (cs == CS_UNKNOWN)
795	}	831	{
796		832	clear ();
797	free (registry);	833	return false;
798	free (encoding);	834	}
799		835
800	if (cs == CS_UNICODE)	836	if (cs == CS_UNICODE)
801	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font	837	cs = CS_UNICODE_16; // X11 can have a max. of 65536 chars per font
802		838
803	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;	839	encm = f->min_byte1 != 0 \|\| f->max_byte1 != 0;
…		…
815	int N = f->max_char_or_byte2 - f->min_char_or_byte2;	851	int N = f->max_char_or_byte2 - f->min_char_or_byte2;
816		852
817	if (encm)	853	if (encm)
818	N += (f->max_byte1 - f->min_byte1)	854	N += (f->max_byte1 - f->min_byte1)
819	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);	855	* (f->max_char_or_byte2 - f->min_char_or_byte2 + 1);
820		856
821	while (N)	857	while (N)
822	{	858	{
823	if (f->per_char[N].width > width)	859	if (f->per_char[N].width > width)
824	width = f->per_char[N].width;	860	width = f->per_char[N].width;
825		861
…		…
850	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;	886	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851		887
852	if (width < g.width) width = g.width;	888	if (width < g.width) width = g.width;
853	}	889	}
854		890
855	if (cs == CS_UNKNOWN)
856	{
857	fprintf (stderr, "unable to deduce codeset, ignoring font '%s'\n", name);
858
859	clear ();
860	return false;
861	}
862
863	#if 0 // do it per-character	891	#if 0 // do it per-character
864	if (prop && width > prop->width)	892	if (prop && width > prop->width)
865	{	893	{
866	clear ();	894	clear ();
867	return false;	895	return false;
…		…
977	else	1005	else
978	{	1006	{
979	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1007	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
980		1008
981	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1009	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
982		1010
983	if (slow)	1011	if (slow)
984	{	1012	{
985	do	1013	do
986	{	1014	{
987	if (xc->byte1 \|\| xc->byte2)	1015	if (xc->byte1 \|\| xc->byte2)
…		…
1009	else	1037	else
1010	{	1038	{
1011	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);	1039	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1012		1040
1013	XChangeGC (disp, gc, GCForeground \| GCFont, &v);	1041	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1014		1042
1015	if (slow)	1043	if (slow)
1016	{	1044	{
1017	do	1045	do
1018	{	1046	{
1019	if (*xc)	1047	if (*xc)
…		…
1039		1067
1040	void clear ();	1068	void clear ();
1041		1069
1042	rxvt_fontprop properties ();	1070	rxvt_fontprop properties ();
1043		1071
1044	bool load (const rxvt_fontprop &prop);	1072	bool load (const rxvt_fontprop &prop, bool force_prop);
1045		1073
1046	void draw (rxvt_drawable &d, int x, int y,	1074	void draw (rxvt_drawable &d, int x, int y,
1047	const text_t *text, int len,	1075	const text_t *text, int len,
1048	int fg, int bg);	1076	int fg, int bg);
1049		1077
1050	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;	1078	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
1051		1079
1052	protected:	1080	protected:
1053	XftFont *f;	1081	XftFont *f;
1054	};	1082	};
1055		1083
…		…
1082		1110
1083	return p;	1111	return p;
1084	}	1112	}
1085		1113
1086	bool	1114	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1115	rxvt_font_xft::load (const rxvt_fontprop &prop, bool force_prop)
1088	{	1116	{
1089	dTermDisplay;	1117	dTermDisplay;
1090		1118
1091	clear ();	1119	clear ();
1092		1120
…		…
1101	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1129	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1130	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1131	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1132
1105	if (prop.weight != rxvt_fontprop::unset	1133	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1134	&& (force_prop \|\| FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch))
1107	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	1135	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
1108		1136
1109	if (prop.slant != rxvt_fontprop::unset	1137	if (prop.slant != rxvt_fontprop::unset
1110	&& FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	1138	&& (force_prop \|\| FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch))
1111	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1139	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1112		1140
1113	#if 0 // clipping unfortunately destroys our precious double-width-characters	1141	#if 0 // clipping unfortunately destroys our precious double-width-characters
1114	// clip width, we can't do better, or can we?	1142	// clip width, we can't do better, or can we?
1115	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	1143	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
1116	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);	1144	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
1117	#endif	1145	#endif
1118		1146
1119	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)	1147	if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)
1120	FcPatternAddBool (p, FC_MINSPACE, 1);	1148	FcPatternAddBool (p, FC_MINSPACE, 1);
1121		1149
…		…
1265	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1293	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1266	const text_t *text, int len,	1294	const text_t *text, int len,
1267	int fg, int bg)	1295	int fg, int bg)
1268	{	1296	{
1269	XGlyphInfo extents;	1297	XGlyphInfo extents;
1270	XftGlyphSpec enc = (XftGlyphSpec )rxvt_temp_buf (len * sizeof (XftGlyphSpec));	1298	XftGlyphSpec *enc = rxvt_temp_buf<XftGlyphSpec> (len);
1271	XftGlyphSpec *ep = enc;	1299	XftGlyphSpec *ep = enc;
1272		1300
1273	dTermDisplay;	1301	dTermDisplay;
1274	dTermGC;	1302	dTermGC;
1275		1303
1276	int w = term->fwidth * len;	1304	int w = term->fwidth * len;
1277	int h = term->fheight;	1305	int h = term->fheight;
1278		1306
1279	bool buffered = false;	1307	bool buffered = bg >= Color_transparent
		1308	&& term->option (Opt_buffered);
1280		1309
1281	// cut trailing spaces	1310	// cut trailing spaces
1282	while (len && text [len - 1] == ' ')	1311	while (len && text [len - 1] == ' ')
1283	len--;	1312	len--;
1284		1313
…		…
1290	int cwidth = term->fwidth;	1319	int cwidth = term->fwidth;
1291	FcChar32 fc = *text++; len--;	1320	FcChar32 fc = *text++; len--;
1292		1321
1293	while (len && *text == NOCHAR)	1322	while (len && *text == NOCHAR)
1294	text++, len--, cwidth += term->fwidth;	1323	text++, len--, cwidth += term->fwidth;
1295		1324
1296	if (fc != ' ') // skip spaces	1325	if (fc != ' ') // skip spaces
1297	{	1326	{
1298	FT_UInt glyph = XftCharIndex (disp, f, fc);	1327	FT_UInt glyph = XftCharIndex (disp, f, fc);
1299	XftGlyphExtents (disp, f, &glyph, 1, &extents);	1328	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1300		1329
…		…
1315	{	1344	{
1316	if (ep != enc)	1345	if (ep != enc)
1317	{	1346	{
1318	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);	1347	rxvt_drawable &d2 = d.screen->scratch_drawable (w, h);
1319		1348
		1349	#ifdef HAVE_BG_PIXMAP
		1350	Picture dst = 0; // the only assignment is done conditionally in the following if condition
		1351
		1352	if (term->bgPixmap.pixmap
		1353	&& (bg == Color_transparent \|\| bg == Color_bg
		1354	\|\| (bg >= 0 && !term->pix_colors[bg].is_opaque () && ((dst = XftDrawPicture (d2))))))
		1355	{
		1356	int src_x = x, src_y = y;
		1357
		1358	if (term->bgPixmap.is_parentOrigin ())
		1359	{
		1360	src_x += term->window_vt_x;
		1361	src_y += term->window_vt_y;
		1362	}
		1363
		1364	if (term->bgPixmap.pmap_width >= src_x + w
		1365	&& term->bgPixmap.pmap_height >= src_y + h)
		1366	{
		1367	XCopyArea (disp, term->bgPixmap.pixmap, d2, gc,
		1368	src_x, src_y, w, h, 0, 0);
		1369	}
		1370	else
		1371	{
		1372	XGCValues gcv;
		1373
		1374	gcv.fill_style = FillTiled;
		1375	gcv.tile = term->bgPixmap.pixmap;
		1376	gcv.ts_x_origin = -src_x;
		1377	gcv.ts_y_origin = -src_y;
		1378
		1379	XChangeGC (disp, gc,
		1380	GCTile \| GCTileStipXOrigin \| GCTileStipYOrigin \| GCFillStyle,
		1381	&gcv);
		1382
		1383	XFillRectangle (disp, d2, gc, 0, 0, w, h);
		1384
		1385	gcv.fill_style = FillSolid;
		1386	XChangeGC (disp, gc, GCFillStyle, &gcv);
		1387	}
		1388
		1389	if (dst)
		1390	{
		1391	Picture solid_color_pict = XftDrawSrcPicture (d2, &term->pix_colors[bg].c);
		1392
		1393	// dst can only be set when bg >= 0
		1394	XRenderComposite (disp, PictOpOver, solid_color_pict, None, dst, 0, 0, 0, 0, 0, 0, w, h);
		1395	}
		1396	}
		1397	else
		1398	#endif
1320	XftDrawRect (d2, &term->pix_colors[bg].c, 0, 0, w, h);	1399	XftDrawRect (d2, &term->pix_colors[bg >= 0 ? bg : Color_bg].c, 0, 0, w, h);
1321		1400
1322	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);	1401	XftDrawGlyphSpec (d2, &term->pix_colors[fg].c, f, enc, ep - enc);
1323	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);	1402	XCopyArea (disp, d2, d, gc, 0, 0, w, h, x, y);
1324	}	1403	}
1325	else	1404	else
…		…
1350	void	1429	void
1351	rxvt_fontset::clear ()	1430	rxvt_fontset::clear ()
1352	{	1431	{
1353	prop.width = prop.height = prop.ascent = prop.weight = prop.slant	1432	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1354	= rxvt_fontprop::unset;	1433	= rxvt_fontprop::unset;
		1434	force_prop = false;
1355		1435
1356	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1436	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1357	FONT_UNREF (*i);	1437	FONT_UNREF (*i);
1358		1438
1359	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)	1439	for (pagemap **p = fmap.begin (); p != fmap.end (); p++)
…		…
1368		1448
1369	rxvt_font *	1449	rxvt_font *
1370	rxvt_fontset::new_font (const char *name, codeset cs)	1450	rxvt_fontset::new_font (const char *name, codeset cs)
1371	{	1451	{
1372	rxvt_font *f;	1452	rxvt_font *f;
1373		1453
1374	if (!name \|\| !*name)	1454	if (!name \|\| !*name)
1375	{	1455	{
1376	name = "";	1456	name = "";
1377	f = new rxvt_font_default (this);	1457	f = new rxvt_font_default (this);
1378	}	1458	}
…		…
1446	if (!end)	1526	if (!end)
1447	end = desc + strlen (desc);	1527	end = desc + strlen (desc);
1448		1528
1449	if (end - desc < 511)	1529	if (end - desc < 511)
1450	{	1530	{
1451	strncpy (buf, desc, end - desc);	1531	memcpy (buf, desc, end - desc);
1452	buf[end - desc] = 0;	1532	buf[end - desc] = 0;
1453		1533
1454	fonts.push_back (new_font (buf, cs));	1534	fonts.push_back (new_font (buf, cs));
1455	}	1535	}
1456	else	1536	else
…		…
1471	if (fonts[i]->loaded)	1551	if (fonts[i]->loaded)
1472	return true;	1552	return true;
1473		1553
1474	fonts[i]->loaded = true;	1554	fonts[i]->loaded = true;
1475		1555
1476	if (!fonts[i]->load (prop))	1556	if (!fonts[i]->load (prop, force_prop))
1477	{	1557	{
1478	fonts[i]->cs = CS_UNKNOWN;	1558	fonts[i]->cs = CS_UNKNOWN;
1479	return false;	1559	return false;
1480	}	1560	}
1481		1561
…		…
1506		1586
1507	return -1;	1587	return -1;
1508	}	1588	}
1509		1589
1510	int	1590	int
1511	rxvt_fontset::find_font (unicode_t unicode)	1591	rxvt_fontset::find_font_idx (unicode_t unicode, bool &careful)
1512	{	1592	{
1513	if (unicode >= 1<<20)	1593	if (unicode >= 1<<20)
1514	return 0;	1594	return 0;
1515		1595
1516	unicode_t hi = unicode >> 8;	1596	unicode_t hi = unicode >> 8;
1517		1597
1518	if (hi < fmap.size ()	1598	if (hi < fmap.size () && fmap[hi])
1519	&& fmap[hi]	1599	{
1520	&& (*fmap[hi])[unicode & 0xff] != 0xff)	1600	unsigned char m = (*fmap[hi])[unicode & 0xff];
1521	return (*fmap[hi])[unicode & 0xff];	1601
		1602	if (m != 0xff)
		1603	{
		1604	careful = m & 128;
		1605	return m & 127;
		1606	}
		1607	}
1522		1608
1523	unsigned int i;	1609	unsigned int i;
1524		1610
1525	for (i = 0; i < fonts.size (); i++)	1611	for (i = 0; i < fonts.size (); i++)
1526	{	1612	{
…		…
1539	}	1625	}
1540		1626
1541	if (f->cs == CS_UNKNOWN)	1627	if (f->cs == CS_UNKNOWN)
1542	goto next_font;	1628	goto next_font;
1543		1629
1544	bool careful;
1545	if (f->has_char (unicode, &prop, careful))	1630	if (f->has_char (unicode, &prop, careful))
1546	{
1547	if (careful)
1548	i \|= 128;
1549
1550	goto found;	1631	goto found;
1551	}
1552		1632
1553	next_font:	1633	next_font:
1554	if (i == fonts.size () - 1)	1634	if (i == fonts.size () - 1)
1555	{	1635	{
1556	if (fallback->name)	1636	if (fallback->name)
…		…
1595	FcPatternDestroy (match);	1675	FcPatternDestroy (match);
1596		1676
1597	if (find_font (font) < 0)	1677	if (find_font (font) < 0)
1598	{	1678	{
1599	char fontname[4096];	1679	char fontname[4096];
1600	sprintf (fontname, "xft:%-.4090s", font);	1680	snprintf (fontname, sizeof (fontname), "xft:%s", font);
1601		1681
1602	fonts.push_back (new_font (fontname, CS_UNICODE));	1682	fonts.push_back (new_font (fontname, CS_UNICODE));
1603	}	1683	}
1604		1684
1605	free (font);	1685	free (font);
1606	}	1686	}
1607	#endif	1687	#endif
…		…
1609	}	1689	}
1610	}	1690	}
1611		1691
1612	/* we must return SOME font */	1692	/* we must return SOME font */
1613	i = 0;	1693	i = 0;
		1694	careful = false;
1614		1695
1615	found:	1696	found:
1616	// found a font, cache it	1697	// found a font, cache it
1617	if (i < 255)	1698	if (i < 255)
1618	{	1699	{
…		…
1623	{	1704	{
1624	fmap[hi] = (pagemap *)new pagemap;	1705	fmap[hi] = (pagemap *)new pagemap;
1625	memset (fmap[hi], 0xff, sizeof (pagemap));	1706	memset (fmap[hi], 0xff, sizeof (pagemap));
1626	}	1707	}
1627		1708
1628	(*fmap[hi])[unicode & 0xff] = i;	1709	(*fmap[hi])[unicode & 0xff] = i \| (careful ? 128 : 0);
1629	}	1710	}
1630		1711
1631	return i;	1712	return i;
1632	}	1713	}
1633		1714
		1715	int
		1716	rxvt_fontset::find_font (unicode_t unicode)
		1717	{
		1718	bool careful;
		1719	int id = find_font_idx (unicode, careful);
1634		1720
		1721	return min<int> (fontCount, id) \| (careful ? Careful : 0);
		1722	}
1635		1723

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.95 by root, Sat Feb 18 14:14:43 2006 UTC vs. Revision 1.156 by root, Tue Mar 30 23:36:14 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.95 by root, Sat Feb 18 14:14:43 2006 UTC vs.
Revision 1.156 by root, Tue Mar 30 23:36:14 2010 UTC