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

Comparing rxvt-unicode/src/rxvtfont.C (file contents):
Revision 1.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/---------------------------------C----------------------------------
2	* File: rxvtfont.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	{
336	Display *disp = d.display->display;	342	dTermDisplay;
		343	dTermGC;
337		344
338	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);
339		346
340	XSetForeground (disp, TGC, r->pix_colors[fg]);	347	XSetForeground (disp, gc, term->pix_colors[fg]);
341		348
342	while (len)	349	while (len)
343	{	350	{
344	#if ENABLE_COMBINING	351	#if ENABLE_COMBINING
345	compose_char *cc;	352	compose_char *cc;
…		…
349		356
350	while (++text, --len && *text == NOCHAR)	357	while (++text, --len && *text == NOCHAR)
351	;	358	;
352		359
353	int width = text - tp;	360	int width = text - tp;
354	int fwidth = r->TermWin.fwidth * width;	361	int fwidth = term->fwidth * width;
355		362
356	if (0x2500 <= t && t <= 0x259f)	363	if (0x2500 <= t && t <= 0x259f)
357	{	364	{
358	uint16_t offs = linedraw_offs[t - 0x2500];	365	uint16_t offs = linedraw_offs[t - 0x2500];
359	uint32_t *a = linedraw_command + (offs >> 4);	366	uint32_t *a = linedraw_command + (offs >> 4);
360	uint32_t *b = a + (offs & 15);	367	uint32_t *b = a + (offs & 15);
361		368
362	int W = fwidth;	369	int W = fwidth;
363	int H = r->TermWin.fheight;	370	int H = term->fheight;
364		371
365	int x_[16];	372	int x_[16];
366	int y_[16];	373	int y_[16];
367		374
368	for (int i = 0; i <= 8; i++)	375	for (int i = 0; i <= 8; i++)
…		…
376		383
377	XGCValues gcv;	384	XGCValues gcv;
378		385
379	gcv.cap_style = CapButt;	386	gcv.cap_style = CapButt;
380	gcv.line_width = 0;	387	gcv.line_width = 0;
381	XChangeGC (disp, TGC, GCLineWidth \| GCCapStyle, &gcv);	388	XChangeGC (disp, gc, GCLineWidth \| GCCapStyle, &gcv);
382		389
383	while (a < b)	390	while (a < b)
384	{	391	{
385	uint32_t command = *a++;	392	uint32_t command = *a++;
386		393
…		…
393	int y2 = y_[(command >> 0) & 15];	400	int y2 = y_[(command >> 0) & 15];
394		401
395	switch (op)	402	switch (op)
396	{	403	{
397	case 0: // line	404	case 0: // line
398	XDrawLine (disp, d, TGC, x1, y1, x2, y2);	405	XDrawLine (disp, d, gc, x1, y1, x2, y2);
399	break;	406	break;
400		407
401	case 1: // rectangle, possibly stippled	408	case 1: // rectangle, possibly stippled
402	if (a)	409	if (a)
403	{	410	{
…		…
406	gcv.fill_style = FillStippled;	413	gcv.fill_style = FillStippled;
407	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);	414	gcv.stipple = XCreateBitmapFromData (disp, d, bm + a * 2, 2, 2);
408	gcv.ts_x_origin = x;	415	gcv.ts_x_origin = x;
409	gcv.ts_y_origin = y;	416	gcv.ts_y_origin = y;
410		417
411	XChangeGC (disp, TGC,	418	XChangeGC (disp, gc,
412	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,	419	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
413	&gcv);	420	&gcv);
414	}	421	}
415		422
416	XFillRectangle (disp, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);	423	XFillRectangle (disp, d, gc, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
417		424
418	if (a)	425	if (a)
419	{	426	{
420	XFreePixmap (disp, gcv.stipple);	427	XFreePixmap (disp, gcv.stipple);
421	gcv.stipple = 0;	428	gcv.stipple = 0;
422	gcv.fill_style = FillSolid;	429	gcv.fill_style = FillSolid;
423	XChangeGC (disp, TGC, GCFillStyle, &gcv);	430	XChangeGC (disp, gc, GCFillStyle, &gcv);
424	}	431	}
425	break;	432	break;
426	case 2: // arc	433	case 2: // arc
427	XDrawArc (disp, d, TGC,	434	XDrawArc (disp, d, gc,
428	x1 - W/2, y1 - H/2, W-1, H-1,	435	x1 - W/2, y1 - H/2, W-1, H-1,
429	(a - 1) * 9064, (b - 1) 90*64);	436	(a - 1) * 9064, (b - 1) 90*64);
430	break;	437	break;
431	}	438	}
432	}	439	}
…		…
463	case ZERO_WIDTH_CHAR:	470	case ZERO_WIDTH_CHAR:
464	case NOCHAR:	471	case NOCHAR:
465	break;	472	break;
466		473
467	default:	474	default:
468	XDrawRectangle (disp, d, TGC, x + 2, y + 2,	475	XDrawRectangle (disp, d, gc, x + 2, y + 2,
469	fwidth - 4, r->TermWin.fheight - 4);	476	fwidth - 4, term->fheight - 4);
470	}	477	}
471		478
472	x += fwidth;	479	x += fwidth;
473	}	480	}
474	}	481	}
…		…
482		489
483	rxvt_fontprop properties ();	490	rxvt_fontprop properties ();
484		491
485	bool load (const rxvt_fontprop &prop);	492	bool load (const rxvt_fontprop &prop);
486		493
487	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;
488		495
489	void draw (rxvt_drawable &d, int x, int y,	496	void draw (rxvt_drawable &d, int x, int y,
490	const text_t *text, int len,	497	const text_t *text, int len,
491	int fg, int bg);	498	int fg, int bg);
492		499
…		…
504	char *	511	char *
505	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
506	{	513	{
507	unsigned long value;	514	unsigned long value;
508		515
509	if (XGetFontProperty (f, XInternAtom (DISPLAY, property, 0), &value))	516	if (XGetFontProperty (f, XInternAtom (term->display->display, property, 0), &value))
510	return XGetAtomName (DISPLAY, value);	517	return XGetAtomName (term->display->display, value);
511	else	518	else
512	return rxvt_strdup (repl);	519	return rxvt_strdup (repl);
513	}	520	}
514		521
515	rxvt_fontprop	522	rxvt_fontprop
…		…
523	bool	530	bool
524	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)
525	{	532	{
526	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;	533	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
527	p.height = height;	534	p.height = height;
		535	p.ascent = rxvt_fontprop::unset;
528	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;
529	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;
530		538
531	return true;	539	return true;
532	}	540	}
…		…
535	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)	543	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
536	{	544	{
537	unsigned long height;	545	unsigned long height;
538		546
539	#if 0	547	#if 0
540	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))	548	if (!XGetFontProperty (f, XInternAtom (term->display->display, "PIXEL_SIZE", 0), &height))
541	return false;	549	return false;
542	#else	550	#else
543	height = f->ascent + f->descent;	551	height = f->ascent + f->descent;
544	#endif	552	#endif
545		553
546	unsigned long avgwidth;	554	unsigned long avgwidth;
547	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))	555	if (!XGetFontProperty (f, XInternAtom (term->display->display, "AVERAGE_WIDTH", 0), &avgwidth))
548	avgwidth = 0;	556	avgwidth = 0;
549		557
550	char *weight = get_property (f, "WEIGHT_NAME", "medium");	558	char *weight = get_property (f, "WEIGHT_NAME", "medium");
551	char *slant = get_property (f, "SLANT", "r");	559	char *slant = get_property (f, "SLANT", "r");
552		560
553	set_properties (p, height, weight, slant, avgwidth);	561	set_properties (p, height, weight, slant, avgwidth);
554		562
555	free (weight);	563	free (weight);
556	free (slant);	564	free (slant);
557		565
		566	p.ascent = f->ascent;
		567
558	return true;	568	return true;
559	}	569	}
560		570
561	bool	571	bool
562	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	572	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
563	{	573	{
		574	dTermDisplay;
564	int slashes = 0;	575	int slashes = 0;
565	const char *comp[13];	576	const char *comp[13];
566		577
567	for (const char c = name; c; c++)	578	for (const char c = name; c; c++)
568	if (*c == '-')	579	if (*c == '-')
…		…
576	if (slashes >= 13	587	if (slashes >= 13
577	&& (comp[ 6] >= '1' && comp[ 6] <= '9')	588	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
578	&& (comp[11] >= '0' && comp[11] <= '9'))	589	&& (comp[11] >= '0' && comp[11] <= '9'))
579	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]));
580		591
581	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	592	XFontStruct *f = XLoadQueryFont (disp, name);
582		593
583	if (f)	594	if (f)
584	{	595	{
585	// 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
586	// (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).
587	// in that case, just return garbage.	598	// in that case, just return garbage.
588	bool ret = set_properties (p, f);	599	bool ret = set_properties (p, f);
589	XFreeFont (DISPLAY, f);	600	XFreeFont (disp, f);
590	return ret;	601	return ret;
591	}	602	}
592	else	603	else
593	return false;	604	return false;
594	}	605	}
…		…
632	}	643	}
633		644
634	bool	645	bool
635	rxvt_font_x11::load (const rxvt_fontprop &prop)	646	rxvt_font_x11::load (const rxvt_fontprop &prop)
636	{	647	{
637	Display *disp = DISPLAY;	648	dTermDisplay;
638		649
639	clear ();	650	clear ();
640		651
641	char field_str[64]; // enough for 128 bits	652	char field_str[64]; // enough for 128 bits
642		653
…		…
716		727
717	int diff = 0;	728	int diff = 0;
718		729
719	if (replace_field (fname, list[i], 6, '0', field_str))	730	if (replace_field (fname, list[i], 6, '0', field_str))
720	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
721		734
722	if (!set_properties (p, fname))	735	if (!set_properties (p, fname))
723	continue;	736	continue;
724		737
725	if (prop.height != rxvt_fontprop::unset	738	if (prop.height != rxvt_fontprop::unset
…		…
741	for (;;)	754	for (;;)
742	{	755	{
743	font_weight *best = fonts + count - 1;	756	font_weight *best = fonts + count - 1;
744		757
745	for (font_weight *w = best; w-- > fonts; )	758	for (font_weight *w = best; w-- > fonts; )
746	if (w->diff < best->diff)	759	if (w->diff <= best->diff)
747	best = w;	760	best = w;
748		761
749	if (!best->name	762	if (!best->name
750	\|\| !(f = XLoadQueryFont (disp, best->name)))	763	\|\| !(f = XLoadQueryFont (disp, best->name)))
751	break;	764	break;
…		…
849		862
850	XCharStruct g;	863	XCharStruct g;
851	int dir_ret, asc_ret, des_ret;	864	int dir_ret, asc_ret, des_ret;
852	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);	865	XTextExtents16 (f, &ch, 1, &dir_ret, &asc_ret, &des_ret, &g);
853		866
854	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;
855		868
856	if (width < g.width) width = g.width;	869	if (width < g.width) width = g.width;
857	}	870	}
858		871
859	if (cs == CS_UNKNOWN)	872	if (cs == CS_UNKNOWN)
…		…
878	void	891	void
879	rxvt_font_x11::clear ()	892	rxvt_font_x11::clear ()
880	{	893	{
881	if (f)	894	if (f)
882	{	895	{
883	XFreeFont (DISPLAY, f);	896	XFreeFont (term->display->display, f);
884	f = 0;	897	f = 0;
885	}	898	}
886	}	899	}
887		900
888	bool	901	bool
889	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
890	{	903	{
891	uint32_t ch = FROM_UNICODE (cs, unicode);	904	uint32_t ch = FROM_UNICODE (cs, unicode);
892		905
893	if (ch == NOCHAR)	906	if (ch == NOCHAR)
894	return false;	907	return false;
…		…
934	return true;	947	return true;
935		948
936	// check character against base font bounding box	949	// check character against base font bounding box
937	int w = xcs->width;	950	int w = xcs->width;
938	int wcw = wcwidth (unicode);	951	int wcw = wcwidth (unicode);
939	if (wcw > 0) w /= wcw;	952	if (wcw > 0) w = (w + wcw - 1) / wcw;
940		953
941	careful = w > prop->width;	954	careful = w > prop->width;
942	if (careful && w > prop->width * MAX_OVERLAP >> 2)	955	if (careful && w > prop->width * MAX_OVERLAP >> 2)
943	return false;	956	return false;
944		957
…		…
953	// this looks like a mess /.	966	// this looks like a mess /.
954	// and it is a mess /.	967	// and it is a mess /.
955	// yet we are trying to be perfect /.	968	// yet we are trying to be perfect /.
956	// but the result still isn't perfect /.	969	// but the result still isn't perfect /.
957		970
		971	dTermDisplay;
		972	dTermGC;
		973
958	bool slow = this->slow	974	bool slow = this->slow
959	\|\| width != r->TermWin.fwidth	975	\|\| width != term->fwidth
960	\|\| height != r->TermWin.fheight;	976	\|\| height != term->fheight;
961		977
962	int base = ascent; // sorry, incorrect: r->TermWin.fbase;	978	int base = ascent; // sorry, incorrect: term->fbase;
963		979
964	XGCValues v;	980	XGCValues v;
965	v.foreground = r->pix_colors[fg];	981	v.foreground = term->pix_colors[fg];
966	v.font = f->fid;	982	v.font = f->fid;
967		983
968	if (enc2b)	984	if (enc2b)
969	{	985	{
970	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	986	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
971		987
972	if (bg == Color_bg && !slow)	988	if (bg == Color_bg && !slow)
973	{	989	{
974	v.background = r->pix_colors[bg];	990	v.background = term->pix_colors[bg];
975	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	991	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
976	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);	992	XDrawImageString16 (disp, d, gc, x, y + base, xc, len);
977	}	993	}
978	else	994	else
979	{	995	{
980	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);
981		997
982	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	998	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
983		999
984	if (slow)	1000	if (slow)
985	{	1001	{
986	do	1002	do
987	{	1003	{
988	if (xc->byte1 \|\| xc->byte2)	1004	if (xc->byte1 \|\| xc->byte2)
989	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);	1005	XDrawString16 (disp, d, gc, x, y + base, xc, 1);
990		1006
991	x += r->TermWin.fwidth;	1007	x += term->fwidth;
992	xc++; len--;	1008	xc++; len--;
993	}	1009	}
994	while (len);	1010	while (len);
995	}	1011	}
996	else	1012	else
997	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);	1013	XDrawString16 (disp, d, gc, x, y + base, xc, len);
998	}	1014	}
999	}	1015	}
1000	else	1016	else
1001	{	1017	{
1002	const char *xc = enc_char (text, len, cs, slow);	1018	const char *xc = enc_char (text, len, cs, slow);
1003		1019
1004	if (bg == Color_bg && !slow)	1020	if (bg == Color_bg && !slow)
1005	{	1021	{
1006	v.background = r->pix_colors[bg];	1022	v.background = term->pix_colors[bg];
1007	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);	1023	XChangeGC (disp, gc, GCForeground \| GCBackground \| GCFont, &v);
1008	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);	1024	XDrawImageString (disp, d, gc, x, y + base, xc, len);
1009	}	1025	}
1010	else	1026	else
1011	{	1027	{
1012	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);
1013		1029
1014	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);	1030	XChangeGC (disp, gc, GCForeground \| GCFont, &v);
1015		1031
1016	if (slow)	1032	if (slow)
1017	{	1033	{
1018	do	1034	do
1019	{	1035	{
1020	if (*xc)	1036	if (*xc)
1021	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);	1037	XDrawString (disp, d, gc, x, y + base, xc, 1);
1022		1038
1023	x += r->TermWin.fwidth;	1039	x += term->fwidth;
1024	xc++; len--;	1040	xc++; len--;
1025	}	1041	}
1026	while (len);	1042	while (len);
1027	}	1043	}
1028	else	1044	else
1029	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);	1045	XDrawString (disp, d, gc, x, y + base, xc, len);
1030	}	1046	}
1031	}	1047	}
1032	}	1048	}
1033		1049
1034	/////////////////////////////////////////////////////////////////////////////	1050	/////////////////////////////////////////////////////////////////////////////
…		…
1046		1062
1047	void draw (rxvt_drawable &d, int x, int y,	1063	void draw (rxvt_drawable &d, int x, int y,
1048	const text_t *text, int len,	1064	const text_t *text, int len,
1049	int fg, int bg);	1065	int fg, int bg);
1050		1066
1051	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;
1052		1068
1053	protected:	1069	protected:
1054	XftFont *f;	1070	XftFont *f;
1055	};	1071	};
1056		1072
1057	void	1073	void
1058	rxvt_font_xft::clear ()	1074	rxvt_font_xft::clear ()
1059	{	1075	{
1060	if (f)	1076	if (f)
1061	{	1077	{
1062	XftFontClose (DISPLAY, f);	1078	XftFontClose (term->display->display, f);
1063	f = 0;	1079	f = 0;
1064	}	1080	}
1065	}	1081	}
1066		1082
1067	rxvt_fontprop	1083	rxvt_fontprop
…		…
1071		1087
1072	FT_Face face = XftLockFace (f);	1088	FT_Face face = XftLockFace (f);
1073		1089
1074	p.width = width;	1090	p.width = width;
1075	p.height = height;	1091	p.height = height;
		1092	p.ascent = ascent;
1076	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD	1093	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD
1077	? rxvt_fontprop::bold : rxvt_fontprop::medium;	1094	? rxvt_fontprop::bold : rxvt_fontprop::medium;
1078	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC	1095	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC
1079	? rxvt_fontprop::italic : rxvt_fontprop::roman;	1096	? rxvt_fontprop::italic : rxvt_fontprop::roman;
1080		1097
…		…
1084	}	1101	}
1085		1102
1086	bool	1103	bool
1087	rxvt_font_xft::load (const rxvt_fontprop &prop)	1104	rxvt_font_xft::load (const rxvt_fontprop &prop)
1088	{	1105	{
1089	Display *disp = DISPLAY;	1106	dTermDisplay;
1090		1107
1091	clear ();	1108	clear ();
1092		1109
1093	FcPattern p = FcNameParse ((FcChar8 ) name);	1110	FcPattern p = FcNameParse ((FcChar8 ) name);
1094		1111
…		…
1096	return false;	1113	return false;
1097		1114
1098	FcValue v;	1115	FcValue v;
1099		1116
1100	if (prop.height != rxvt_fontprop::unset	1117	if (prop.height != rxvt_fontprop::unset
1101	\|\| (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch	1118	&& (FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch
1102	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))	1119	&& FcPatternGet (p, FC_SIZE, 0, &v) != FcResultMatch))
1103	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);	1120	FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
1104		1121
1105	if (prop.weight != rxvt_fontprop::unset	1122	if (prop.weight != rxvt_fontprop::unset
1106	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)	1123	&& FcPatternGet (p, FC_WEIGHT, 0, &v) != FcResultMatch)
…		…
1121		1138
1122	// store generated name so iso14755 view gives better results	1139	// store generated name so iso14755 view gives better results
1123	set_name ((char *)FcNameUnparse (p));	1140	set_name ((char *)FcNameUnparse (p));
1124		1141
1125	XftResult result;	1142	XftResult result;
1126	FcPattern *match = XftFontMatch (disp, r->display->screen, p, &result);	1143	FcPattern *match = XftFontMatch (disp, term->display->screen, p, &result);
1127		1144
1128	FcPatternDestroy (p);	1145	FcPatternDestroy (p);
1129		1146
1130	if (!match)	1147	if (!match)
1131	return false;	1148	return false;
…		…
1152		1169
1153	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;	1170	bool scalable = face->face_flags & FT_FACE_FLAG_SCALABLE;
1154		1171
1155	XftUnlockFace (f);	1172	XftUnlockFace (f);
1156		1173
		1174	int glheight = height;
		1175
1157	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; )
1158	{	1177	{
1159	FcChar16 ch = *t;	1178	FcChar16 ch = *t;
1160		1179
1161	if (cs != CS_UNICODE	1180	if (cs != CS_UNICODE
…		…
1169	continue;	1188	continue;
1170		1189
1171	XGlyphInfo g;	1190	XGlyphInfo g;
1172	XftTextExtents16 (disp, f, &ch, 1, &g);	1191	XftTextExtents16 (disp, f, &ch, 1, &g);
1173		1192
		1193	g.width -= g.x;
		1194
1174	int wcw = wcwidth (ch);	1195	int wcw = wcwidth (ch);
1175	if (wcw > 0) g.width = g.width / wcw;	1196	if (wcw > 0) g.width = (g.width + wcw - 1) / wcw;
1176		1197
1177	if (width < g.width) width = g.width;	1198	if (width < g.width ) width = g.width;
1178	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;
1179	}	1212	}
1180		1213
1181	if (prop.height == rxvt_fontprop::unset	1214	if (prop.height == rxvt_fontprop::unset
1182	\|\| height <= prop.height	1215	\|\| (height <= prop.height && glheight <= prop.height)
1183	\|\| height <= 2	1216	\|\| height <= 2
1184	\|\| !scalable)	1217	\|\| !scalable)
1185	break;	1218	break;
1186		1219
1187	if (ftheight)	1220	if (ftheight)
…		…
1194	ftheight -= height - prop.height;	1227	ftheight -= height - prop.height;
1195	}	1228	}
1196	else	1229	else
1197	ftheight = prop.height - 1;	1230	ftheight = prop.height - 1;
1198		1231
1199	XftFontClose (disp, f);	1232	XftFontClose (disp, f);
1200	FcPatternDel (match, FC_PIXEL_SIZE);	1233	FcPatternDel (match, FC_PIXEL_SIZE);
1201	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);	1234	FcPatternAddInteger (match, FC_PIXEL_SIZE, ftheight);
1202	}	1235	}
1203		1236
1204	FcPatternDestroy (match);	1237	FcPatternDestroy (match);
1205		1238
1206	#if 0 // do it per-character	1239	#if 0 // do it per-character
…		…
1213		1246
1214	return success;	1247	return success;
1215	}	1248	}
1216		1249
1217	bool	1250	bool
1218	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
1219	{	1252	{
1220	careful = false;	1253	careful = false;
1221		1254
1222	if (!XftCharExists (DISPLAY, f, unicode))	1255	if (!XftCharExists (term->display->display, f, unicode))
1223	return false;	1256	return false;
1224		1257
1225	if (!prop \|\| prop->width == rxvt_fontprop::unset)	1258	if (!prop \|\| prop->width == rxvt_fontprop::unset)
1226	return true;	1259	return true;
1227		1260
1228	// check character against base font bounding box	1261	// check character against base font bounding box
1229	FcChar32 ch = unicode;	1262	FcChar32 ch = unicode;
1230	XGlyphInfo g;	1263	XGlyphInfo g;
1231	XftTextExtents32 (DISPLAY, f, &ch, 1, &g);	1264	XftTextExtents32 (term->display->display, f, &ch, 1, &g);
1232		1265
1233	int w = g.width;	1266	int w = g.width - g.x;
1234	int wcw = wcwidth (unicode);	1267	int wcw = wcwidth (unicode);
1235	if (wcw > 0) w /= wcw;	1268	if (wcw > 0) w = (w + wcw - 1) / wcw;
1236		1269
1237	careful = w > prop->width;	1270	careful = w > prop->width;
1238	if (careful && w > prop->width * MAX_OVERLAP >> 2)	1271	if (careful && w > prop->width * MAX_OVERLAP >> 2)
1239	return false;	1272	return false;
1240		1273
…		…
1244	void	1277	void
1245	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,	1278	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
1246	const text_t *text, int len,	1279	const text_t *text, int len,
1247	int fg, int bg)	1280	int fg, int bg)
1248	{	1281	{
1249	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);
1250
1251	int base = ascent; // should be fbase, but that is incorrect
1252		1283
1253	XGlyphInfo extents;	1284	XGlyphInfo extents;
1254	FcChar32 enc = (FcChar32 ) get_enc_buf (len * sizeof (FcChar32));	1285	XftGlyphSpec enc = (XftGlyphSpec )get_enc_buf (len * sizeof (XftGlyphSpec));
1255	FcChar32 *ep = enc;	1286	XftGlyphSpec *ep = enc;
1256	int ewidth = 0;	1287
1257	int xoff = 0;	1288	dTermDisplay;
		1289	dTermGC;
		1290
		1291	// cut trailing spaces
		1292	while (len && text [len - 1] == ' ')
		1293	len--;
1258		1294
1259	while (len)	1295	while (len)
1260	{	1296	{
1261	int cwidth = r->TermWin.fwidth;	1297	int cwidth = term->fwidth;
1262	FcChar32 fc = *text++; len--;	1298	FcChar32 fc = *text++; len--;
1263	FT_UInt gl;
1264		1299
1265	while (len && *text == NOCHAR)	1300	while (len && *text == NOCHAR)
1266	text++, len--, cwidth += r->TermWin.fwidth;	1301	text++, len--, cwidth += term->fwidth;
1267		1302
1268	gl = XftCharIndex (d.display->display, f, fc);	1303	if (fc != ' ') // skip spaces
1269	XftGlyphExtents (d.display->display, f, &gl, 1, &extents);
1270
1271	if (extents.xOff != cwidth && ep != enc)
1272	{
1273	if (xoff > ewidth) xoff = ewidth;
1274	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,
1275	x + (ewidth - xoff >> 1),
1276	y + base, enc, ep - enc);
1277	x += ewidth;
1278
1279	ep = enc;
1280	ewidth = 0;
1281	xoff = 0;
1282	}	1304	{
		1305	FT_UInt glyph = XftCharIndex (disp, f, fc);
		1306	XftGlyphExtents (disp, f, &glyph, 1, &extents);
1283		1307
1284	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++;
1285	{	1312	}
		1313
1286	x += cwidth;	1314	x += cwidth;
1287	continue;
1288	}
1289
1290	else
1291	{
1292	*ep++ = gl;
1293	ewidth += cwidth;
1294	xoff += extents.xOff;
1295	}
1296	}	1315	}
1297		1316
1298	if (ep != enc)	1317	if (ep != enc)
1299	{
1300	if (xoff > ewidth) xoff = ewidth;
1301	XftDrawGlyphs (d, &r->pix_colors[fg].c, f,	1318	XftDrawGlyphSpec (d, &term->pix_colors[fg].c, f, enc, ep - enc);
1302	x + (ewidth - xoff >> 1),
1303	y + base, enc, ep - enc);
1304	}
1305	}	1319	}
1306	#endif	1320	#endif
1307		1321
1308	/////////////////////////////////////////////////////////////////////////////	1322	/////////////////////////////////////////////////////////////////////////////
1309		1323
1310	rxvt_fontset::rxvt_fontset (rxvt_t r)	1324	rxvt_fontset::rxvt_fontset (rxvt_term *term)
1311	: r (r), fontdesc (0)	1325	: fontdesc (0), term (term)
1312	{	1326	{
1313	clear ();	1327	clear ();
1314	}	1328	}
1315		1329
1316	rxvt_fontset::~rxvt_fontset ()	1330	rxvt_fontset::~rxvt_fontset ()
…		…
1319	}	1333	}
1320		1334
1321	void	1335	void
1322	rxvt_fontset::clear ()	1336	rxvt_fontset::clear ()
1323	{	1337	{
1324	prop.width = prop.height = prop.weight = prop.slant	1338	prop.width = prop.height = prop.ascent = prop.weight = prop.slant
1325	= rxvt_fontprop::unset;	1339	= rxvt_fontprop::unset;
1326		1340
1327	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)	1341	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
1328	FONT_UNREF (*i);	1342	FONT_UNREF (*i);
1329		1343
…		…
1360	f = new rxvt_font_x11;	1374	f = new rxvt_font_x11;
1361	}	1375	}
1362	else	1376	else
1363	f = new rxvt_font_x11;	1377	f = new rxvt_font_x11;
1364		1378
1365	f->set_term (r);	1379	f->set_term (term);
1366	f->set_name (strdup (name));	1380	f->set_name (strdup (name));
1367		1381
1368	f->cs = cs;	1382	f->cs = cs;
1369	f->loaded = false;	1383	f->loaded = false;
1370		1384
…		…
1502	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)	1516	if (FROM_UNICODE (f->cs, unicode) == NOCHAR)
1503	goto next_font;	1517	goto next_font;
1504		1518
1505	if (!realize_font (i))	1519	if (!realize_font (i))
1506	goto next_font;	1520	goto next_font;
		1521
		1522	if (prop.ascent != rxvt_fontprop::unset)
		1523	max_it (f->ascent, prop.ascent);
1507	}	1524	}
1508		1525
1509	if (f->cs == CS_UNKNOWN)	1526	if (f->cs == CS_UNKNOWN)
1510	goto next_font;	1527	goto next_font;
1511		1528
…		…
1550	FcPatternAddInteger (p, FC_SLANT, prop.slant);	1567	FcPatternAddInteger (p, FC_SLANT, prop.slant);
1551	FcPatternAddBool (p, FC_MINSPACE, 1);	1568	FcPatternAddBool (p, FC_MINSPACE, 1);
1552	//FcPatternAddBool (p, FC_ANTIALIAS, 1);	1569	//FcPatternAddBool (p, FC_ANTIALIAS, 1);
1553		1570
1554	XftResult result;	1571	XftResult result;
1555	FcPattern *match = XftFontMatch (DISPLAY, r->display->screen, p, &result);	1572	FcPattern *match = XftFontMatch (term->display->display, term->display->screen, p, &result);
1556		1573
1557	FcPatternDestroy (p);	1574	FcPatternDestroy (p);
1558		1575
1559	if (match)	1576	if (match)
1560	{	1577	{

Diff Legend

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

Comparing rxvt-unicode/src/rxvtfont.C (file contents): Revision 1.67 by root, Sat Feb 12 18:55:04 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.67 by root, Sat Feb 12 18:55:04 2005 UTC vs.
Revision 1.84 by root, Tue Jan 17 05:47:42 2006 UTC