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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.64 by root, Tue Jan 11 05:45:57 2005 UTC vs.
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: defaultfont.C	2	* File: rxvtfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>	4	* Copyright (c) 2003-2006 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
14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	* GNU General Public License for more details.	15	* GNU General Public License for more details.
16	*	16	*
17	* You should have received a copy of the GNU General Public License	17	* You should have received a copy of the GNU General Public License
18	* along with this program; if not, write to the Free Software	18	* along with this program; if not, write to the Free Software
19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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"
24	#include "rxvtutil.h"	25	#include "rxvtutil.h"
25	#include "rxvtfont.h"	26	#include "rxvtfont.h"
26		27
27	#include <cstdlib>	28	#include <cstdlib>
28	#include <wchar.h>	29	#include <wchar.h>
29	#include <inttypes.h>	30	#include <inttypes.h>
30
31	#define DISPLAY r->display->display
32	#define TGC r->TermWin.gc
33		31
34	#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width	32	#define MAX_OVERLAP (4 + 1) // max. character width in 4ths of the base width
35		33
36	const struct rxvt_fallback_font {	34	const struct rxvt_fallback_font {
37	codeset cs;	35	codeset cs;
…		…
130	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },	128	{ CS_UNICODE, "--lucidatypewriter---------m--iso10646-1" },
131	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	129	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
132	{ CS_UNICODE, "----r-------c--iso10646-1" },	130	{ CS_UNICODE, "----r-------c--iso10646-1" },
133	{ CS_UNICODE, "----r-------m--iso10646-1" },	131	{ CS_UNICODE, "----r-------m--iso10646-1" },
134	#if XFT	132	#if XFT
135	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true"},	133	{ CS_UNICODE, "xft:Bitstream Vera Sans Mono:antialias=false:autohint=true" },
136	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },	134	{ CS_UNICODE, "xft:Courier New:antialias=false:autohint=true" },
137	{ CS_UNICODE, "xft:Andale Mono:antialias=false" },	135	{ CS_UNICODE, "xft:Andale Mono:antialias=false:autohint=false" },
138	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false" },	136	{ CS_UNICODE, "xft:Arial Unicode MS:antialias=false:autohint=false" },
139		137
140	// FreeMono is usually uglier than x fonts, so try last only.	138	// FreeMono is usually uglier than x fonts, so try last only.
141	{ CS_UNICODE, "xft:FreeMono:autohint=true" },	139	{ CS_UNICODE, "xft:FreeMono:autohint=true" },
142	#endif	140	#endif
143		141
…		…
152	0x304c, 0x672c, // が本	150	0x304c, 0x672c, // が本
153	};	151	};
154		152
155	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))	153	#define NUM_EXTENT_TEST_CHARS (sizeof (extent_test_chars) / sizeof (extent_test_chars[0]))
156		154
		155	#define dTermDisplay Display *disp = term->display->display
		156	#define dTermGC GC gc = term->gc
		157
157	/////////////////////////////////////////////////////////////////////////////	158	/////////////////////////////////////////////////////////////////////////////
158		159
159	#if XFT	160	#if XFT
160	rxvt_drawable::~rxvt_drawable ()	161	rxvt_drawable::~rxvt_drawable ()
161	{	162	{
…		…
245	if (this->name) free (this->name); // let the compiler optimize	246	if (this->name) free (this->name); // let the compiler optimize
246	this->name = name;	247	this->name = name;
247	}	248	}
248		249
249	void	250	void
250	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)	251	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color) const
251	{	252	{
		253	dTermDisplay;
		254	dTermGC;
		255
252	if (color == Color_bg)	256	if (color == Color_bg)
253	XClearArea (d.display->display, d, x, y, w, h, FALSE);	257	XClearArea (disp, d, x, y, w, h, FALSE);
254	else if (color >= 0)	258	else if (color >= 0)
255	{	259	{
256	#if XFT	260	#if XFT
257	XftDrawRect (d, &r->pix_colors[color].c, x, y, w, h);	261	XftDrawRect (d, &term->pix_colors[color].c, x, y, w, h);
258	#else	262	#else
259	XSetForeground (d.display->display, TGC, r->pix_colors[color]);	263	XSetForeground (disp, gc, term->pix_colors[color]);
260	XFillRectangle (d.display->display, d, TGC, x, y, w, h);	264	XFillRectangle (disp, d, gc, x, y, w, h);
261	#endif	265	#endif
262	}	266	}
263	}	267	}
264		268
265	#include "table/linedraw.h"	269	#include "table/linedraw.h"
…		…
276	rxvt_fontprop properties ()	280	rxvt_fontprop properties ()
277	{	281	{
278	rxvt_fontprop p;	282	rxvt_fontprop p;
279		283
280	p.width = p.height = 1;	284	p.width = p.height = 1;
		285	p.ascent = rxvt_fontprop::unset;
281	p.weight = rxvt_fontprop::medium;	286	p.weight = rxvt_fontprop::medium;
282	p.slant = rxvt_fontprop::roman;	287	p.slant = rxvt_fontprop::roman;
283		288
284	return p;	289	return p;
285	}	290	}
…		…
292	set_name (strdup ("built-in support font"));	297	set_name (strdup ("built-in support font"));
293		298
294	return true;	299	return true;
295	}	300	}
296		301
297	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	302	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
298	{	303	{
299	careful = false;	304	careful = false;
300		305
301	if (unicode <= 0x001f)	306	if (unicode <= 0x001f)
302	return true;	307	return true;
…		…
305	return false;	310	return false;
306		311
307	if (unicode <= 0x009f)	312	if (unicode <= 0x009f)
308	return true;	313	return true;
309		314
310	if (unicode >= 0x2500 && unicode <= 0x259f)	315	if (unicode >= 0x2500 && unicode <= 0x259f &&
		316	!term->option (Opt_skipBuiltinGlyphs))
311	return true;	317	return true;
312		318
313	if (IS_COMPOSE (unicode))	319	if (IS_COMPOSE (unicode))
314	return true;	320	return true;
315		321
…		…
331	void	337	void
332	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	338	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
333	const text_t *text, int len,	339	const text_t *text, int len,
334	int fg, int bg)	340	int fg, int bg)
335	{	341	{
		342	dTermDisplay;
		343	dTermGC;
		344
336	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	345	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
337		346
338	XSetForeground (d.display->display, TGC, r->pix_colors[fg]);	347	XSetForeground (disp, gc, term->pix_colors[fg]);
339		348
340	while (len)	349	while (len)
341	{	350	{
342	#if ENABLE_COMBINING	351	#if ENABLE_COMBINING
343	compose_char *cc;	352	compose_char *cc;
…		…
347		356
348	while (++text, --len && *text == NOCHAR)	357	while (++text, --len && *text == NOCHAR)
349	;	358	;
350		359
351	int width = text - tp;	360	int width = text - tp;
352	int fwidth = r->TermWin.fwidth * width;	361	int fwidth = term->fwidth * width;
353		362
354	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
355	{	364	{
356	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
357	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
358	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
359		368
360	int W = fwidth;	369	int W = fwidth;
361	int H = r->TermWin.fheight;	370	int H = term->fheight;
362		371
363	int x_[16];	372	int x_[16];
364	int y_[16];	373	int y_[16];
365		374
366	for (int i = 0; i <= 8; i++)	375	for (int i = 0; i <= 8; i++)
…		…
374		383
375	XGCValues gcv;	384	XGCValues gcv;
376		385
377	gcv.cap_style = CapButt;	386	gcv.cap_style = CapButt;
378	gcv.line_width = 0;	387	gcv.line_width = 0;
379	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);	388	XChangeGC (disp, gc, GCLineWidth \| GCCapStyle, &gcv);
380		389
381	while (a < b)	390	while (a < b)
382	{	391	{
383	uint32_t command = *a++;	392	uint32_t command = *a++;
384		393
…		…
391	int y2 = y_[(command >> 0) & 15];	400	int y2 = y_[(command >> 0) & 15];
392		401
393	switch (op)	402	switch (op)
394	{	403	{
395	case 0: // line	404	case 0: // line
396	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);	405	XDrawLine (disp, d, gc, x1, y1, x2, y2);
397	break;	406	break;
398		407
399	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
400	if (a)	409	if (a)
401	{	410	{
402	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };	411	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
403		412
404	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
405	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
406	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
407	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
408		417
409	XChangeGC (d.display->display, TGC,	418	XChangeGC (disp, gc,
410	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,	419	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
411	&gcv);	420	&gcv);
412	}	421	}
413		422
414	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	423	XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
415		424
416	if (a)	425	if (a)
417	{	426	{
418	XFreePixmap (d.display->display, gcv.stipple);	427	XFreePixmap (disp, gcv.stipple);
419	gcv.stipple = 0;	428	gcv.stipple = 0;
420	gcv.fill_style = FillSolid;	429	gcv.fill_style = FillSolid;
421	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);	430	XChangeGC (disp, gc, GCFillStyle, &gcv);
422	}	431	}
423	break;	432	break;
424	case 2: // arc	433	case 2: // arc
425	XDrawArc (d.display->display, d, TGC,	434	XDrawArc (disp, d, gc,
426	x1 - W/2, y1 - H/2, W-1, H-1,	435	x1 - W/2, y1 - H/2, W-1, H-1,
427	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
428	break;	437	break;
429	}	438	}
430	}	439	}
…		…
461	case ZERO_WIDTH_CHAR:	470	case ZERO_WIDTH_CHAR:
462	case NOCHAR:	471	case NOCHAR:
463	break;	472	break;
464		473
465	default:	474	default:
466	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,	475	XDrawRectangle (disp, d, gc, x + 2, y + 2,
467	fwidth - 4, r->TermWin.fheight - 4);	476	fwidth - 4, term->fheight - 4);
468	}	477	}
469		478
470	x += fwidth;	479	x += fwidth;
471	}	480	}
472	}	481	}
…		…
480		489
481	rxvt_fontprop properties ();	490	rxvt_fontprop properties ();
482		491
483	bool load (const rxvt_fontprop &prop);	492	bool load (const rxvt_fontprop &prop);
484		493
485	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful);	494	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const;
486		495
487	void draw (rxvt_drawable &d, int x, int y,	496	void draw (rxvt_drawable &d, int x, int y,
488	const text_t *text, int len,	497	const text_t *text, int len,
489	int fg, int bg);	498	int fg, int bg);
490		499
…		…
502	char *	511	char *
503	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	512	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
504	{	513	{
505	unsigned long value;	514	unsigned long value;
506		515
507	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))
508	return XGetAtomName (DISPLAY, value);	517	return XGetAtomName (term->display->display, value);
509	else	518	else
510	return rxvt_strdup (repl);	519	return rxvt_strdup (repl);
511	}	520	}
512		521
513	rxvt_fontprop	522	rxvt_fontprop
…		…
521	bool	530	bool
522	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)	531	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
523	{	532	{
524	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
525	p.height = height;	534	p.height = height;
		535	p.ascent = rxvt_fontprop::unset;
526	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	536	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
527	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	537	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
528		538
529	return true;	539	return true;
530	}	540	}
…		…
533	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
534	{	544	{
535	unsigned long height;	545	unsigned long height;
536		546
537	#if 0	547	#if 0
538	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))
539	return false;	549	return false;
540	#else	550	#else
541	height = f->ascent + f->descent;	551	height = f->ascent + f->descent;
542	#endif	552	#endif
543		553
544	unsigned long avgwidth;	554	unsigned long avgwidth;
545	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
546	avgwidth = 0;	556	avgwidth = 0;
547		557
548	char *weight = get_property (f, "WEIGHT_NAME", "medium");	558	char *weight = get_property (f, "WEIGHT_NAME", "medium");
549	char *slant = get_property (f, "SLANT", "r");	559	char *slant = get_property (f, "SLANT", "r");
550		560
551	set_properties (p, height, weight, slant, avgwidth);	561	set_properties (p, height, weight, slant, avgwidth);
552		562
553	free (weight);	563	free (weight);
554	free (slant);	564	free (slant);
555		565
		566	p.ascent = f->ascent;
		567
556	return true;	568	return true;
557	}	569	}
558		570
559	bool	571	bool
560	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	572	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
561	{	573	{
		574	dTermDisplay;
562	int slashes = 0;	575	int slashes = 0;
563	const char *comp[13];	576	const char *comp[13];
564		577
565	for (const char c = name; c; c++)	578	for (const char c = name; c; c++)
566	if (*c == '-')	579	if (*c == '-')
…		…
574	if (slashes >= 13	587	if (slashes >= 13
575	&& (comp[ 6] >= '1' && comp[ 6] <= '9')	588	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
576	&& (comp[11] >= '0' && comp[11] <= '9'))	589	&& (comp[11] >= '0' && comp[11] <= '9'))
577	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));	590	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
578		591
579	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	592	XFontStruct *f = XLoadQueryFont (disp, name);
580		593
581	if (f)	594	if (f)
582	{	595	{
583	// the font should really exist now. if not, we have a problem	596	// the font should really exist now. if not, we have a problem
584	// (e.g. if the user did xset fp rehash just when we were searching fonts).	597	// (e.g. if the user did xset fp rehash just when we were searching fonts).
585	// in that case, just return garbage.	598	// in that case, just return garbage.
586	bool ret = set_properties (p, f);	599	bool ret = set_properties (p, f);
587	XFreeFont (DISPLAY, f);	600	XFreeFont (disp, f);
588	return ret;	601	return ret;
589	}	602	}
590	else	603	else
591	return false;	604	return false;
592	}	605	}
…		…
630	}	643	}
631		644
632	bool	645	bool
633	rxvt_font_x11::load (const rxvt_fontprop &prop)	646	rxvt_font_x11::load (const rxvt_fontprop &prop)
634	{	647	{
		648	dTermDisplay;
		649
635	clear ();	650	clear ();
636		651
637	char field_str[64]; // enough for 128 bits	652	char field_str[64]; // enough for 128 bits
638		653
639	// first morph the font if required	654	// first morph the font if required
…		…
642	{	657	{
643	char fname[1024];	658	char fname[1024];
644		659
645	if (name[0] != '-')	660	if (name[0] != '-')
646	{	661	{
647	f = XLoadQueryFont (DISPLAY, name);	662	f = XLoadQueryFont (disp, name);
648		663
649	if (!f)	664	if (!f)
650	return false;	665	return false;
651		666
652	char *new_name = get_property (f, "FONT", name);	667	char *new_name = get_property (f, "FONT", name);
…		…
654	if (new_name)	669	if (new_name)
655	set_name (new_name);	670	set_name (new_name);
656	else	671	else
657	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);	672	rxvt_warn ("font '%s' has no FONT property, continuing without.", name);
658		673
659	XFreeFont (DISPLAY, f);	674	XFreeFont (disp, f);
660	f = 0;	675	f = 0;
661	}	676	}
662		677
663	if (prop.weight != rxvt_fontprop::unset)	678	if (prop.weight != rxvt_fontprop::unset)
664	{	679	{
…		…
694	~font_weight () { free (name); }	709	~font_weight () { free (name); }
695	};	710	};
696		711
697	char **list;	712	char **list;
698	int count;	713	int count;
699	list = XListFonts (DISPLAY, name, 4000, &count);	714	list = XListFonts (disp, name, 4000, &count);
700		715
701	set_name (0);	716	set_name (0);
702		717
703	if (!list)	718	if (!list)
704	return false;	719	return false;
…		…
712		727
713	int diff = 0;	728	int diff = 0;
714		729
715	if (replace_field (fname, list[i], 6, '0', field_str))	730	if (replace_field (fname, list[i], 6, '0', field_str))
716	diff += 10; // slightly penalize scalable fonts	731	diff += 10; // slightly penalize scalable fonts
		732	else if (replace_field (fname, list[i], 11, '0', "0"))
		733	diff += 300; // more heavily penalize what looks like scaled bitmap fonts
717		734
718	if (!set_properties (p, fname))	735	if (!set_properties (p, fname))
719	continue;	736	continue;
720		737
721	if (prop.height != rxvt_fontprop::unset	738	if (prop.height != rxvt_fontprop::unset
…		…
737	for (;;)	754	for (;;)
738	{	755	{
739	font_weight *best = fonts + count - 1;	756	font_weight *best = fonts + count - 1;
740		757
741	for (font_weight *w = best; w-- > fonts; )	758	for (font_weight *w = best; w-- > fonts; )
742	if (w->diff < best->diff)	759	if (w->diff <= best->diff)
743	best = w;	760	best = w;
744		761
745	if (!best->name	762	if (!best->name
746	\|\| !(f = XLoadQueryFont (DISPLAY, best->name)))	763	\|\| !(f = XLoadQueryFont (disp, best->name)))
747	break;	764	break;
748		765
749	set_name (best->name);	766	set_name (best->name);
750	best->clear ();	767	best->clear ();
751		768
…		…
845		862
846	XCharStruct g;	863	XCharStruct g;
847	int dir_ret, asc_ret, des_ret;	864	int dir_ret, asc_ret, des_ret;
848	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
849		866
850	int wcw = wcwidth (*t); if (wcw > 0) g.width = g.width / wcw;	867	int wcw = wcwidth (*t); if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
851		868
852	if (width < g.width) width = g.width;	869	if (width < g.width) width = g.width;
853	}	870	}
854		871
855	if (cs == CS_UNKNOWN)	872	if (cs == CS_UNKNOWN)
…		…
874	void	891	void
875	rxvt_font_x11::clear ()	892	rxvt_font_x11::clear ()
876	{	893	{
877	if (f)	894	if (f)
878	{	895	{
879	XFreeFont (DISPLAY, f);	896	XFreeFont (term->display->display, f);
880	f = 0;	897	f = 0;
881	}	898	}
882	}	899	}
883		900
884	bool	901	bool
885	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	902	rxvt_font_x11::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
886	{	903	{
887	uint32_t ch = FROM_UNICODE (cs, unicode);	904	uint32_t ch = FROM_UNICODE (cs, unicode);
888		905
889	if (ch == NOCHAR)	906	if (ch == NOCHAR)
890	return false;	907	return false;
…		…
930	return true;	947	return true;
931		948
932	// check character against base font bounding box	949	// check character against base font bounding box
933	int w = xcs->width;	950	int w = xcs->width;
934	int wcw = wcwidth (unicode);	951	int wcw = wcwidth (unicode);
935	if (wcw > 0) w /= wcw;	952	if (wcw > 0) w = (w + wcw - 1) / wcw;
936		953
937	careful = w > prop->width;	954	careful = w > prop->width;
938	if (careful && w > prop->width * MAX_OVERLAP >> 2)	955	if (careful && w > prop->width * MAX_OVERLAP >> 2)
939	return false;	956	return false;
940		957
…		…
949	// this looks like a mess /.	966	// this looks like a mess /.
950	// and it is a mess /.	967	// and it is a mess /.
951	// yet we are trying to be perfect /.	968	// yet we are trying to be perfect /.
952	// but the result still isn't perfect /.	969	// but the result still isn't perfect /.
953		970
		971	dTermDisplay;
		972	dTermGC;
		973
954	bool slow = this->slow	974	bool slow = this->slow
955	\|\| width != r->TermWin.fwidth	975	\|\| width != term->fwidth
956	\|\| height != r->TermWin.fheight;	976	\|\| height != term->fheight;
957		977
958	int base = ascent; // sorry, incorrect: r->TermWin.fbase;	978	int base = ascent; // sorry, incorrect: term->fbase;
959		979
960	XGCValues v;	980	XGCValues v;
961	v.foreground = r->pix_colors[fg];	981	v.foreground = term->pix_colors[fg];
962	v.font = f->fid;	982	v.font = f->fid;
963		983
964	if (enc2b)	984	if (enc2b)
965	{	985	{
966	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	986	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
967		987
968	if (bg == Color_bg && !slow)	988	if (bg == Color_bg && !slow)
969	{	989	{
970	v.background = r->pix_colors[bg];	990	v.background = term->pix_colors[bg];
971	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	991	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
972	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);	992	XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
973	}	993	}
974	else	994	else
975	{	995	{
976	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	996	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
977		997
978	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
979		999
980	if (slow)	1000	if (slow)
981	{	1001	{
982	do	1002	do
983	{	1003	{
984	if (xc->byte1 \|\| xc->byte2)	1004	if (xc->byte1 \|\| xc->byte2)
985	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);	1005	XDrawString16 (disp, d, gc, x, y + base, xc, 1);
986		1006
987	x += r->TermWin.fwidth;	1007	x += term->fwidth;
988	xc++; len--;	1008	xc++; len--;
989	}	1009	}
990	while (len);	1010	while (len);
991	}	1011	}
992	else	1012	else
993	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);	1013	XDrawString16 (disp, d, gc, x, y + base, xc, len);
994	}	1014	}
995	}	1015	}
996	else	1016	else
997	{	1017	{
998	const char *xc = enc_char (text, len, cs, slow);	1018	const char *xc = enc_char (text, len, cs, slow);
999		1019
1000	if (bg == Color_bg && !slow)	1020	if (bg == Color_bg && !slow)
1001	{	1021	{
1002	v.background = r->pix_colors[bg];	1022	v.background = term->pix_colors[bg];
1003	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	1023	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
1004	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);	1024	XDrawImageString (disp, d, gc, x, y + base, xc, len);
1005	}	1025	}
1006	else	1026	else
1007	{	1027	{
1008	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1028	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1009		1029
1010	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1011		1031
1012	if (slow)	1032	if (slow)
1013	{	1033	{
1014	do	1034	do
1015	{	1035	{
1016	if (*xc)	1036	if (*xc)
1017	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);	1037	XDrawString (disp, d, gc, x, y + base, xc, 1);
1018		1038
1019	x += r->TermWin.fwidth;	1039	x += term->fwidth;
1020	xc++; len--;	1040	xc++; len--;
1021	}	1041	}
1022	while (len);	1042	while (len);
1023	}	1043	}
1024	else	1044	else
1025	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);	1045	XDrawString (disp, d, gc, x, y + base, xc, len);
1026	}	1046	}
1027	}	1047	}
1028	}	1048	}
1029		1049
1030	/////////////////////////////////////////////////////////////////////////////	1050	/////////////////////////////////////////////////////////////////////////////
…		…
1042		1062
1043	void draw (rxvt_drawable &d, int x, int y,	1063	void draw (rxvt_drawable &d, int x, int y,
1044	const text_t *text, int len,	1064	const text_t *text, int len,
1045	int fg, int bg);	1065	int fg, int bg);
1046		1066
1047	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull);	1067	bool has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &carefull) const;
1048		1068
1049	protected:	1069	protected:
1050	XftFont *f;	1070	XftFont *f;
1051	};	1071	};
1052		1072
1053	void	1073	void
1054	rxvt_font_xft::clear ()	1074	rxvt_font_xft::clear ()
1055	{	1075	{
1056	if (f)	1076	if (f)
1057	{	1077	{
1058	XftFontClose (DISPLAY, f);	1078	XftFontClose (term->display->display, f);
1059	f = 0;	1079	f = 0;
1060	}	1080	}
1061	}	1081	}
1062		1082
1063	rxvt_fontprop	1083	rxvt_fontprop
…		…
1067		1087
1068	FT_Face face = XftLockFace (f);	1088	FT_Face face = XftLockFace (f);
1069		1089
1070	p.width = width;	1090	p.width = width;
1071	p.height = height;	1091	p.height = height;
		1092	p.ascent = ascent;
1072	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD	1093	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1073	? rxvt_fontprop::bold : rxvt_fontprop::medium;	1094	? rxvt_fontprop::bold : rxvt_fontprop::medium;
1074	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC	1095	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1075	? rxvt_fontprop::italic : rxvt_fontprop::roman;	1096	? rxvt_fontprop::italic : rxvt_fontprop::roman;
1076		1097
…		…
1080	}	1101	}
1081		1102
1082	bool	1103	bool
1083	rxvt_font_xft::load (const rxvt_fontprop &prop)	1104	rxvt_font_xft::load (const rxvt_fontprop &prop)
1084	{	1105	{
		1106	dTermDisplay;
		1107
1085	clear ();	1108	clear ();
1086		1109
1087	FcPattern p = FcNameParse ((FcChar8 ) name);	1110	FcPattern p = FcNameParse ((FcChar8 ) name);
1088		1111
1089	if (!p)	1112	if (!p)
1090	return false;	1113	return false;
1091		1114
1092	FcValue v;	1115	FcValue v;
1093		1116
1094	if (prop.height != rxvt_fontprop::unset	1117	if (prop.height != rxvt_fontprop::unset
1095	\|\| (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1096	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1097	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1098		1121
1099	if (prop.weight != rxvt_fontprop::unset	1122	if (prop.weight != rxvt_fontprop::unset
1100	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1123	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
…		…
1115		1138
1116	// store generated name so iso14755 view gives better results	1139	// store generated name so iso14755 view gives better results
1117	set_name ((char *)FcNameUnparse (p));	1140	set_name ((char *)FcNameUnparse (p));
1118		1141
1119	XftResult result;	1142	XftResult result;
1120	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1143	FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1121		1144
1122	FcPatternDestroy (p);	1145	FcPatternDestroy (p);
1123		1146
1124	if (!match)	1147	if (!match)
1125	return false;	1148	return false;
…		…
1127	int ftheight = 0;	1150	int ftheight = 0;
1128	bool success = true;	1151	bool success = true;
1129		1152
1130	for (;;)	1153	for (;;)
1131	{	1154	{
1132	f = XftFontOpenPattern (DISPLAY, FcPatternDuplicate (match));	1155	f = XftFontOpenPattern (disp, FcPatternDuplicate (match));
1133		1156
1134	if (!f)	1157	if (!f)
1135	{	1158	{
1136	success = false;	1159	success = false;
1137	break;	1160	break;
…		…
1146		1169
1147	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;	1170	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1148		1171
1149	XftUnlockFace (f);	1172	XftUnlockFace (f);
1150		1173
		1174	int glheight = height;
		1175
1151	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )	1176	for (uint16_t *t = extent_test_chars + NUM_EXTENT_TEST_CHARS; t-- > extent_test_chars; )
1152	{	1177	{
1153	FcChar16 ch = *t;	1178	FcChar16 ch = *t;
1154		1179
1155	if (cs != CS_UNICODE	1180	if (cs != CS_UNICODE
…		…
1161	bool careful;	1186	bool careful;
1162	if (!has_char (*t, &prop, careful))	1187	if (!has_char (*t, &prop, careful))
1163	continue;	1188	continue;
1164		1189
1165	XGlyphInfo g;	1190	XGlyphInfo g;
1166	XftTextExtents16 (DISPLAY, f, &ch, 1, &g);	1191	XftTextExtents16 (disp, f, &ch, 1, &g);
		1192
		1193	g.width -= g.x;
1167		1194
1168	int wcw = wcwidth (ch);	1195	int wcw = wcwidth (ch);
1169	if (wcw > 0) g.width = g.width / wcw;	1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1170		1197
1171	if (width < g.width) width = g.width;	1198	if (width < g.width ) width = g.width;
1172	if (height < g.height) height = g.height;	1199	if (height < g.height ) height = g.height;
		1200	if (glheight < g.height - g.y) glheight = g.height - g.y;
		1201	}
		1202
		1203	if (!width)
		1204	{
		1205	rxvt_warn ("unable to calculate font width for '%s', ignoring.\n", name);
		1206
		1207	XftFontClose (disp, f);
		1208	f = 0;
		1209
		1210	success = false;
		1211	break;
1173	}	1212	}
1174		1213
1175	if (prop.height == rxvt_fontprop::unset	1214	if (prop.height == rxvt_fontprop::unset
1176	\|\| height <= prop.height	1215	\|\| (height <= prop.height && glheight <= prop.height)
1177	\|\| height <= 2	1216	\|\| height <= 2
1178	\|\| !scalable)	1217	\|\| !scalable)
1179	break;	1218	break;
1180		1219
1181	if (ftheight)	1220	if (ftheight)
…		…
1188	ftheight -= height - prop.height;	1227	ftheight -= height - prop.height;
1189	}	1228	}
1190	else	1229	else
1191	ftheight = prop.height - 1;	1230	ftheight = prop.height - 1;
1192		1231
1193	XftFontClose (DISPLAY, f);	1232	XftFontClose (disp, f);
1194	FcPatternDel (match, FC_PIXEL_SIZE);	1233	FcPatternDel (match, FC_PIXEL_SIZE);
1195	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);	1234	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1196	}	1235	}
1197		1236
1198	FcPatternDestroy (match);	1237	FcPatternDestroy (match);
1199		1238
1200	#if 0 // do it per-character	1239	#if 0 // do it per-character
…		…
1207		1246
1208	return success;	1247	return success;
1209	}	1248	}
1210		1249
1211	bool	1250	bool
1212	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful)	1251	rxvt_font_xft::has_char (unicode_t unicode, const rxvt_fontprop *prop, bool &careful) const
1213	{	1252	{
1214	careful = false;	1253	careful = false;
1215		1254
1216	if (!XftCharExists (DISPLAY, f, unicode))	1255	if (!XftCharExists (term->display->display, f, unicode))
1217	return false;	1256	return false;
1218		1257
1219	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1220	return true;	1259	return true;
1221		1260
1222	// check character against base font bounding box	1261	// check character against base font bounding box
1223	FcChar32 ch = unicode;	1262	FcChar32 ch = unicode;
1224	XGlyphInfo g;	1263	XGlyphInfo g;
1225	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);	1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);
1226		1265
1227	int w = g.width;	1266	int w = g.width - g.x;
1228	int wcw = wcwidth (unicode);	1267	int wcw = wcwidth (unicode);
1229	if (wcw > 0) w /= wcw;	1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1230		1269
1231	careful = w > prop->width;	1270	careful = w > prop->width;
1232	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)
1233	return false;	1272	return false;
1234		1273
…		…
1238	void	1277	void
1239	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1240	const text_t *text, int len,	1279	const text_t *text, int len,
1241	int fg, int bg)	1280	int fg, int bg)
1242	{	1281	{
1243	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	1282	clear_rect (d, x, y, term->fwidth * len, term->fheight, bg);
1244
1245	int base = ascent; // should be fbase, but that is incorrect
1246		1283
1247	XGlyphInfo extents;	1284	XGlyphInfo extents;
1248	FcChar32 enc = (FcChar32 ) get_enc_buf (len * sizeof (FcChar32));	1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));
1249	FcChar32 *ep = enc;	1286	XftGlyphSpec *ep = enc;
1250	int ewidth = 0;	1287
1251	int xoff = 0;	1288	dTermDisplay;
		1289	dTermGC;
		1290
		1291	// cut trailing spaces
		1292	while (len && text [len - 1] == ' ')
		1293	len--;
1252		1294
1253	while (len)	1295	while (len)
1254	{	1296	{
1255	int cwidth = r->TermWin.fwidth;	1297	int cwidth = term->fwidth;
1256	FcChar32 fc = *text++; len--;	1298	FcChar32 fc = *text++; len--;
1257	FT_UInt gl;
1258		1299
1259	while (len && *text == NOCHAR)	1300	while (len && *text == NOCHAR)
1260	text++, len--, cwidth += r->TermWin.fwidth;	1301	text++, len--, cwidth += term->fwidth;
1261		1302
1262	gl = XftCharIndex (d.display->display, f, fc);	1303	if (fc != ' ') // skip spaces
1263	XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1264
1265	if (extents.xOff != cwidth && ep != enc)
1266	{
1267	if (xoff > ewidth) xoff = ewidth;
1268	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1269	x + (ewidth - xoff >> 1),
1270	y + base, enc, ep - enc);
1271	x += ewidth;
1272
1273	ep = enc;
1274	ewidth = 0;
1275	xoff = 0;
1276	}	1304	{
		1305	FT_UInt glyph = XftCharIndex (disp, f, fc);
		1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1277		1307
1278	if (fc == ' ' && ep == enc) // skip leading spaces	1308	ep->glyph = glyph;
		1309	ep->x = x + (cwidth - extents.xOff >> 1);
		1310	ep->y = y + ascent;
		1311	ep++;
1279	{	1312	}
		1313
1280	x += cwidth;	1314	x += cwidth;
1281	continue;
1282	}
1283
1284	else
1285	{
1286	*ep++ = gl;
1287	ewidth += cwidth;
1288	xoff += extents.xOff;
1289	}
1290	}	1315	}
1291		1316
1292	if (ep != enc)	1317	if (ep != enc)
1293	{
1294	if (xoff > ewidth) xoff = ewidth;
1295	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,	1318	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1296	x + (ewidth - xoff >> 1),
1297	y + base, enc, ep - enc);
1298	}
1299	}	1319	}
1300	#endif	1320	#endif
1301		1321
1302	/////////////////////////////////////////////////////////////////////////////	1322	/////////////////////////////////////////////////////////////////////////////
1303		1323
1304	rxvt_fontset::rxvt_fontset (rxvt_t r)	1324	rxvt_fontset::rxvt_fontset (rxvt_term *term)
1305	: r (r), fontdesc (0)	1325	: fontdesc (0), term (term)
1306	{	1326	{
1307	clear ();	1327	clear ();
1308	}	1328	}
1309		1329
1310	rxvt_fontset::~rxvt_fontset ()	1330	rxvt_fontset::~rxvt_fontset ()
…		…
1313	}	1333	}
1314		1334
1315	void	1335	void
1316	rxvt_fontset::clear ()	1336	rxvt_fontset::clear ()
1317	{	1337	{
1318	prop.width = prop.height = prop.weight = prop.slant	1338	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1319	= rxvt_fontprop::unset;	1339	= rxvt_fontprop::unset;
1320		1340
1321	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1341	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1322	FONT_UNREF (*i);	1342	FONT_UNREF (*i);
1323		1343
…		…
1354	f = new rxvt_font_x11;	1374	f = new rxvt_font_x11;
1355	}	1375	}
1356	else	1376	else
1357	f = new rxvt_font_x11;	1377	f = new rxvt_font_x11;
1358		1378
1359	f->set_term (r);	1379	f->set_term (term);
1360	f->set_name (strdup (name));	1380	f->set_name (strdup (name));
1361		1381
1362	f->cs = cs;	1382	f->cs = cs;
1363	f->loaded = false;	1383	f->loaded = false;
1364		1384
…		…
1375	char buf[512];	1395	char buf[512];
1376	const char *end;	1396	const char *end;
1377		1397
1378	do	1398	do
1379	{	1399	{
1380	while (*desc <= ' ') desc++;	1400	while (desc && desc <= ' ')
		1401	desc++;
1381		1402
1382	codeset cs = CS_UNICODE;	1403	codeset cs = CS_UNICODE;
1383		1404
1384	if (*desc == '[')	1405	if (*desc == '[')
1385	{	1406	{
…		…
1495	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1516	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1496	goto next_font;	1517	goto next_font;
1497		1518
1498	if (!realize_font (i))	1519	if (!realize_font (i))
1499	goto next_font;	1520	goto next_font;
		1521
		1522	if (prop.ascent != rxvt_fontprop::unset)
		1523	max_it (f->ascent, prop.ascent);
1500	}	1524	}
1501		1525
1502	if (f->cs == CS_UNKNOWN)	1526	if (f->cs == CS_UNKNOWN)
1503	goto next_font;	1527	goto next_font;
1504		1528
…		…
1543	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1544	FcPatternAddBool (p, FC_MINSPACE, 1);	1568	FcPatternAddBool (p, FC_MINSPACE, 1);
1545	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1546		1570
1547	XftResult result;	1571	XftResult result;
1548	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
1549		1573
1550	FcPatternDestroy (p);	1574	FcPatternDestroy (p);
1551		1575
1552	if (match)	1576	if (match)
1553	{	1577	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.64 by root, Tue Jan 11 05:45:57 2005 UTC vs. Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.64 by root, Tue Jan 11 05:45:57 2005 UTC vs.
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC