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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC

…		…
73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77	# endif	77	# endif
		78	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "-----------c-*-cns11643.1992-1" },	79	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "-----------c-*-cns11643.1992-2" },	80	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "-----------c-*-cns11643.1992-3" },	81	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "-----------c-*-cns11643.1992-4" },	82	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "-----------c-*-cns11643.1992-5" },	83	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "-----------c-*-cns11643.1992-6" },	84	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "-----------c-*-cns11643.1992-7" },	85	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "-----------c-*-cns11643.1992-f" },	86	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	87	#endif
87		88
88	#if XFT	89	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	90	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	91	{ CS_UNICODE, "xft:Arial Unicode MS" },
…		…
227	struct rxvt_font_default : rxvt_font {	228	struct rxvt_font_default : rxvt_font {
228	rxvt_fontprop properties ()	229	rxvt_fontprop properties ()
229	{	230	{
230	rxvt_fontprop p;	231	rxvt_fontprop p;
231		232
232	p.height = 1;	233	p.width = p.height = 1;
233	p.weight = rxvt_fontprop::medium;	234	p.weight = rxvt_fontprop::medium;
234	p.slant = rxvt_fontprop::roman;	235	p.slant = rxvt_fontprop::roman;
235		236
236	return p;	237	return p;
237	}	238	}
…		…
337	rxvt_font_x11 () { f = 0; }	338	rxvt_font_x11 () { f = 0; }
338		339
339	void clear ();	340	void clear ();
340		341
341	rxvt_fontprop properties ();	342	rxvt_fontprop properties ();
342	rxvt_fontprop properties (XFontStruct *f);
343		343
344	bool load (const rxvt_fontprop &prop);	344	bool load (const rxvt_fontprop &prop);
345		345
346	bool has_codepoint (uint32_t unicode);	346	bool has_codepoint (uint32_t unicode);
347		347
…		…
352	XFontStruct *f;	352	XFontStruct *f;
353	codeset cs;	353	codeset cs;
354	bool enc2b, encm;	354	bool enc2b, encm;
355		355
356	const char get_property (XFontStruct f, const char property, const char repl) const;	356	const char get_property (XFontStruct f, const char property, const char repl) const;
		357	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		358	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		359	bool set_properties (rxvt_fontprop &p, const char *name);
357	};	360	};
358		361
359	const char *	362	const char *
360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	363	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
361	{	364	{
…		…
368	}	371	}
369		372
370	rxvt_fontprop	373	rxvt_fontprop
371	rxvt_font_x11::properties ()	374	rxvt_font_x11::properties ()
372	{	375	{
373	return properties (f);
374	}
375
376	rxvt_fontprop
377	rxvt_font_x11::properties (XFontStruct *f)
378	{
379	rxvt_fontprop p;	376	rxvt_fontprop p;
		377	set_properties (p, f);
		378	return p;
		379	}
380		380
		381	bool
		382	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		383	{
		384	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		385	p.height = height;
		386	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		387	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		388
		389	return true;
		390	}
		391
		392	bool
		393	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		394	{
381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	395	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382	const char *slant = get_property (f, "SLANT", "r");	396	const char *slant = get_property (f, "SLANT", "r");
383		397
384	p.height = height;	398	unsigned long height;
385	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	399	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
386	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	400	return false;
387		401
388	return p;	402	unsigned long avgwidth;
		403	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		404	avgwidth = 0;
		405
		406	return set_properties (p, height, weight, slant, avgwidth);
		407	}
		408
		409	bool
		410	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		411	{
		412	int slashes = 0;
		413	const char *comp[12];
		414
		415	for (const char c = name; c; c++)
		416	if (*c == '-')
		417	{
		418	comp[slashes++] = c + 1;
		419	if (slashes >= 13)
		420	break;
		421	}
		422
		423	/* can we short-circuit the costly XLoadQueryFont? */
		424	if (slashes >= 13
		425	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		426	&& (comp[11] >= '0' && comp[11] <= '9'))
		427	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		428
		429	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		430
		431	if (f)
		432	{
		433	// the font should really exists now. if not, we have a problem
		434	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		435	// in that case, just return garbage.
		436	bool ret = set_properties (p, f);
		437	XFreeFont (DISPLAY, f);
		438	return ret;
		439	}
		440	else
		441	return false;
		442	}
		443
		444	// fix the size of scalable fonts
		445	static void
		446	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		447	{
		448	int slashes = 0;
		449	const char *size;
		450
		451	for (const char c = name; c; c++)
		452	if (*c == '-')
		453	{
		454	if (slashes == 6)
		455	size = c + 1;
		456
		457	if (++slashes >= 13)
		458	break;
		459	}
		460
		461	if (slashes >= 13 && size[0] == '0')
		462	{
		463	strncpy (buf, name, size - name);
		464	buf += size - name;
		465	buf += sprintf (buf, "%d", prop.height);
		466	strcpy (buf, size + 1);
		467	}
		468	else
		469	strcpy (buf, name);
389	}	470	}
390		471
391	bool	472	bool
392	rxvt_font_x11::load (const rxvt_fontprop &prop)	473	rxvt_font_x11::load (const rxvt_fontprop &prop)
393	{	474	{
394	clear ();	475	clear ();
395		476
396	char **list;	477	char **list;
397	int count;	478	int count;
398	XFontStruct *info;
399	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	479	list = XListFonts (DISPLAY, name, 512, &count);
		480	set_name (0);
400		481
401	if (!list)	482	if (!list)
402	return false;	483	return false;
403		484
404	int bestdiff = 0x7fffffff;	485	int bestdiff = 0x7fffffff;
405	XFontStruct *best = 0;
406	for (int i = 0; i < count; i++)	486	for (int i = 0; i < count; i++)
407	{	487	{
408	XFontStruct *f = info + i;	488	rxvt_fontprop p;
		489	char fname[1024];
		490	fix_scalable (fname, list[i], prop);
409		491
		492	if (!set_properties (p, fname))
		493	continue;
		494
410	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	495	if (p.height > prop.height) // weed out too large fonts
411	{	496	continue;
412	rxvt_fontprop p = properties (f);	497
413	int diff = (prop.height - f->ascent + f->descent) * 32	498	int diff = (prop.height - p.height) * 32
414	+ abs (prop.weight - p.weight)	499	+ abs (prop.weight - p.weight)
415	+ abs (prop.slant - p.slant );	500	+ abs (prop.slant - p.slant );
416		501
417	if (!best // compare against best found so far	502	if (!name // compare against best found so far
418	\|\| diff < bestdiff)	503	\|\| diff < bestdiff)
419	{	504	{
420	best = f;	505	set_name (strdup (fname));
421	bestdiff = diff;	506	bestdiff = diff;
422	}	507	}
423	}
424	}	508	}
425		509
		510	XFreeFontNames (list);
		511
426	if (!best)	512	if (!name)
427	return false;	513	return false;
428
429	set_name (strdup (list[best - info]));
430
431	XFreeFontInfo (list, info, count);
432		514
433	f = XLoadQueryFont (DISPLAY, name);	515	f = XLoadQueryFont (DISPLAY, name);
434		516
435	if (!f)	517	if (!f)
436	return false;	518	return false;
…		…
658	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	740	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
659	#define SWATHBITS 8	741	#define SWATHBITS 8
660	#endif	742	#endif
661		743
662	struct rxvt_font_xft : rxvt_font {	744	struct rxvt_font_xft : rxvt_font {
663	#if 0
664	enum {
665	SWATHCOUNT = 1 << (21 - UNIBITS),
666	SWATHSIZE = 1 << (SWATHBITS - 5)
667	};
668	typedef uint32_t swath[SWATHSIZE];
669
670	swath *cvr[SWATHCOUNT];
671	#endif
672
673	#if 0
674	void gen_coverage_swath (unsigned int page);
675
676	bool has_char (uint32_t ch)
677	{
678	unsigned int page = ch >> SWATHBITS;
679	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
680
681	if (page >= SWATHCOUNT)
682	return false;
683
684	if (!cvr[page]) gen_coverage_swath (page);
685
686	return cvr[page][idx >> 5] & (1 << (idx & 31));
687	}
688	#endif
689	rxvt_font_xft () { f = 0; d = 0; }	745	rxvt_font_xft () { f = 0; d = 0; }
690		746
691	void clear ();	747	void clear ();
692		748
693	rxvt_fontprop properties ();	749	rxvt_fontprop properties ();
…		…
701	bool has_codepoint (uint32_t unicode);	757	bool has_codepoint (uint32_t unicode);
702		758
703	protected:	759	protected:
704	XftFont *f;	760	XftFont *f;
705	XftDraw *d;	761	XftDraw *d;
706
707	#if 0
708	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
709	void set_swath (uint32_t ch)
710	{
711	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
712	}
713	#endif
714	};	762	};
715		763
716	void	764	void
717	rxvt_font_xft::clear ()	765	rxvt_font_xft::clear ()
718	{	766	{
…		…
725	if (d)	773	if (d)
726	{	774	{
727	XftDrawDestroy (d);	775	XftDrawDestroy (d);
728	d = 0;	776	d = 0;
729	}	777	}
730
731	#if 0
732	for (int i = 0; i < SWATHCOUNT; i++)
733	delete cvr[i];
734	#endif
735	}	778	}
736		779
737	rxvt_fontprop	780	rxvt_fontprop
738	rxvt_font_xft::properties ()	781	rxvt_font_xft::properties ()
739	{	782	{
740	rxvt_fontprop p;	783	rxvt_fontprop p;
741		784
742	FT_Face face = XftLockFace (f);	785	FT_Face face = XftLockFace (f);
743		786
744	p.height = height;	787	p.width = width; p.height = height;
745	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	788	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
746	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;	789	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747		790
748	XftUnlockFace (f);	791	XftUnlockFace (f);
749		792
…		…
771	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	814	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772		815
773	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	816	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774	FcPatternAddInteger (p, FC_SLANT, prop.slant);	817	FcPatternAddInteger (p, FC_SLANT, prop.slant);
775		818
		819	#if 0 // clipping unfortunately destroys our precious double-width-characters
		820	// clip width, we can't do better, or can we?
		821	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		822	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		823	#endif
		824
776	//FcPatternAddBool (p, FC_MINSPACE, 1);	825	//FcPatternAddBool (p, FC_MINSPACE, 1);
777		826
778	XftResult result;	827	XftResult result;
779	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	828	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
780		829
…		…
832	XftUnlockFace (f);	881	XftUnlockFace (f);
833		882
834	return true;	883	return true;
835	}	884	}
836		885
837	#if 0
838	void rxvt_font::gen_coverage_swath (unsigned int page)
839	{
840	cvr[page] = new swath;
841
842	for (int i = 0; i < SWATHSIZE; i++)
843	cvr[page][i] = 0;
844
845	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
846	}
847	#endif
848
849	bool	886	bool
850	rxvt_font_xft::has_codepoint (uint32_t unicode)	887	rxvt_font_xft::has_codepoint (uint32_t unicode)
851	{	888	{
852	return XftCharExists (DISPLAY, f, unicode);	889	return XftCharExists (DISPLAY, f, unicode);
853	}	890	}
…		…
866	if (bg >= 0 && bg != Color_bg)	903	if (bg >= 0 && bg != Color_bg)
867	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);	904	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
868	else	905	else
869	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	906	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
870		907
871	if (!slow && width == r->TermWin.fwidth)	908	if (!slow && width == r->TermWin.fwidth && 0)
872	{	909	{
873	if (sizeof (text_t) == sizeof (FcChar16))	910	if (sizeof (text_t) == sizeof (FcChar16))
874	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	911	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
875	else	912	else
876	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	913	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
879	{	916	{
880	while (len)	917	while (len)
881	{	918	{
882	if (text != NOCHAR && text != ' ')	919	if (text != NOCHAR && text != ' ')
883	{	920	{
		921	int fwidth = r->TermWin.fwidth;
		922	if (len >= 2 && text[1] == NOCHAR)
		923	fwidth *= 2;
		924
		925	XGlyphInfo extents;
884	if (sizeof (text_t) == sizeof (FcChar16))	926	if (sizeof (text_t) == sizeof (FcChar16))
885	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	927	{
		928	XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);
		929	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		930	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		931	}
886	else	932	else
887	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	933	{
		934	XGlyphInfo extents;
		935	XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);
		936	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		937	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		938	}
888	}	939	}
889		940
890	x += r->TermWin.fwidth;	941	x += r->TermWin.fwidth;
891	text++;	942	text++;
892	len--;	943	len--;
…		…
1040	base_id = 1;	1091	base_id = 1;
1041		1092
1042	// we currently need a base-font, no matter what	1093	// we currently need a base-font, no matter what
1043	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1094	if (fonts.size () <= base_id \|\| !realize_font (base_id))
1044	{	1095	{
		1096	puts ("unable to load specified font(s), falling back to 'fixed'\n");
1045	add_fonts ("fixed");	1097	add_fonts ("fixed");
1046	base_id = fonts.size () - 1;	1098	base_id = fonts.size () - 1;
1047	}	1099	}
1048		1100
1049	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1101	if (fonts.size () <= base_id \|\| !realize_font (base_id))

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs. Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.15 by pcg, Thu Jan 29 00:38:56 2004 UTC