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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC

…		…
1	/---------------------------------C----------------------------------;	1	/---------------------------------C----------------------------------;
2	* File: defaultfont.C	2	* File: defaultfont.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	* Copyright (c) 2003 Marc Lehmann rxvt@plan9.de>	4	* Copyright (c) 2003-2004 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
23	#include "rxvt.h"	23	#include "rxvt.h"
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->Xdisplay	28	#define DISPLAY r->display->display
29	#define DRAWABLE r->TermWin.vt
30	#define GC r->TermWin.gc	29	#define GC r->TermWin.gc
31		30
32	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
33	codeset cs;	32	codeset cs;
34	const char *name;	33	const char *name;
…		…
73	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
74	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
75	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
76	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
77	# endif	76	# endif
		77	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "-----------c-*-cns11643.1992-1" },	78	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "-----------c-*-cns11643.1992-2" },	79	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "-----------c-*-cns11643.1992-3" },	80	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "-----------c-*-cns11643.1992-4" },	81	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "-----------c-*-cns11643.1992-5" },	82	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "-----------c-*-cns11643.1992-6" },	83	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "-----------c-*-cns11643.1992-7" },	84	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "-----------c-*-cns11643.1992-f" },	85	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	86	#endif
87		87
88	#if XFT	88	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	89	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	90	{ CS_UNICODE, "xft:Arial Unicode MS" },
…		…
98	{ CS_UNKNOWN, 0 }	98	{ CS_UNKNOWN, 0 }
99	};	99	};
100		100
101	/////////////////////////////////////////////////////////////////////////////	101	/////////////////////////////////////////////////////////////////////////////
102		102
		103	#if XFT
		104	rxvt_drawable::~rxvt_drawable ()
		105	{
		106	if (xftdrawable)
		107	XftDrawDestroy (xftdrawable);
		108	}
		109
		110	rxvt_drawable::operator XftDraw *()
		111	{
		112	if (!xftdrawable)
		113	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
		114
		115	return xftdrawable;
		116	}
		117	#endif
		118
		119	/////////////////////////////////////////////////////////////////////////////
		120
103	static void *enc_buf;	121	static void *enc_buf;
104	static uint32_t enc_len;	122	static uint32_t enc_len;
105		123
106	static inline void *	124	static inline void *
107	get_enc_buf (int len)	125	get_enc_buf (uint32_t len)
108	{	126	{
109	if (len > enc_len)	127	if (len > enc_len)
110	{	128	{
111	free (enc_buf);	129	free (enc_buf);
112	enc_buf = malloc (len);	130	enc_buf = malloc (len);
…		…
114		132
115	return enc_buf;	133	return enc_buf;
116	}	134	}
117		135
118	static const char *	136	static const char *
119	enc_char (const text_t *text, int len, codeset cs, bool &zero)	137	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120	{	138	{
121	uint8_t buf = (uint8_t )get_enc_buf (len);	139	uint8_t buf = (uint8_t )get_enc_buf (len);
122		140
123	while (len--)	141	while (len--)
124	{	142	{
…		…
135		153
136	return (const char *)enc_buf;	154	return (const char *)enc_buf;
137	}	155	}
138		156
139	static const XChar2b *	157	static const XChar2b *
140	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	158	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141	{	159	{
142	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	160	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
143		161
144	while (len--)	162	while (len--)
145	{	163	{
…		…
160	}	178	}
161		179
162	/////////////////////////////////////////////////////////////////////////////	180	/////////////////////////////////////////////////////////////////////////////
163		181
164	void	182	void
165	rxvt_font::clear_rect (int x, int y, int w, int h, int color)	183	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166	{	184	{
167	if (color == Color_bg)	185	if (color == Color_bg)
168	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	186	XClearArea (d.display->display, d, x, y, w, h, FALSE);
169	else if (color >= 0)	187	else if (color >= 0)
170	{	188	{
		189	#if XFT
		190	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		191	#else
171	XSetForeground (DISPLAY, GC, r->PixColors[color]);	192	XSetForeground (d.display->display, GC, r->PixColors[color]);
172	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	193	XFillRectangle (d.display->display, d, GC, x, y, w, h);
		194	#endif
173	}	195	}
174	}	196	}
175		197
176	static const char *linedraw_cmds[128] = {	198	static const char *linedraw_cmds[128] = {
177	"1hH", "2hH", "1vV", "2vV",	199	"1hH", "2hH", "1vV", "2vV",
…		…
262	}	284	}
263		285
264	return false;	286	return false;
265	}	287	}
266		288
267	void draw (int x, int y,	289	void draw (rxvt_drawable &d, int x, int y,
268	const text_t *text, int len,	290	const text_t *text, int len,
269	int fg, int bg);	291	int fg, int bg);
270	};	292	};
271		293
272	void	294	void
273	rxvt_font_default::draw (int x, int y,	295	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274	const text_t *text, int len,	296	const text_t *text, int len,
275	int fg, int bg)	297	int fg, int bg)
276	{	298	{
277	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	299	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278		300
279	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	301	XSetForeground (d.display->display, GC, r->PixColors[fg]);
280		302
281	while (len--)	303	while (len--)
282	{	304	{
283	text_t t = *text++;	305	text_t t = *text++;
284		306
285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	307	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286	{	308	{
287	const char *p = linedraw_cmds[t - 0x2500];	309	const char *p = linedraw_cmds[t - 0x2500];
288		310
289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	311	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
290	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	312	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
291		313
292	XGCValues gcv;	314	XGCValues gcv;
293		315
294	while (*p)	316	while (*p)
295	{	317	{
296	switch (*p++)	318	switch (*p++)
297	{	319	{
298	case '1':	320	case '1':
299	gcv.line_width = 0;	321	gcv.line_width = 0;
300	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	322	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301	break;	323	break;
302		324
303	case '2':	325	case '2':
304	gcv.line_width = 2;	326	gcv.line_width = 2;
305	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	327	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306	break;	328	break;
307		329
308	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	330	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;
309	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	331	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
310	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	332	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
311	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	333	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
312	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;	334	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
313	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;	335	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314	}	336	}
315	}	337	}
316		338
317	gcv.line_width = 0;	339	gcv.line_width = 0;
318	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	340	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
319	}	341	}
320	else	342	else
321	switch (*text++)	343	switch (*text++)
322	{	344	{
323	case NOCHAR:	345	case NOCHAR:
324	case ZERO_WIDTH_CHAR:	346	case ZERO_WIDTH_CHAR:
325	break;	347	break;
326	default:	348	default:
327	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	349	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
328	}	350	}
329		351
330	x += r->TermWin.fwidth;	352	x += r->TermWin.fwidth;
331	}	353	}
332	}	354	}
…		…
337	rxvt_font_x11 () { f = 0; }	359	rxvt_font_x11 () { f = 0; }
338		360
339	void clear ();	361	void clear ();
340		362
341	rxvt_fontprop properties ();	363	rxvt_fontprop properties ();
342	rxvt_fontprop properties (XFontStruct *f);
343		364
344	bool load (const rxvt_fontprop &prop);	365	bool load (const rxvt_fontprop &prop);
345		366
346	bool has_codepoint (uint32_t unicode);	367	bool has_codepoint (uint32_t unicode);
347		368
348	void draw (int x, int y,	369	void draw (rxvt_drawable &d, int x, int y,
349	const text_t *text, int len,	370	const text_t *text, int len,
350	int fg, int bg);	371	int fg, int bg);
351		372
352	XFontStruct *f;	373	XFontStruct *f;
353	codeset cs;	374	codeset cs;
354	bool enc2b, encm;	375	bool enc2b, encm;
355		376
356	const char get_property (XFontStruct f, const char property, const char repl) const;	377	const char get_property (XFontStruct f, const char property, const char repl) const;
		378	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		379	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		380	bool set_properties (rxvt_fontprop &p, const char *name);
357	};	381	};
358		382
359	const char *	383	const char *
360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	384	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
361	{	385	{
…		…
368	}	392	}
369		393
370	rxvt_fontprop	394	rxvt_fontprop
371	rxvt_font_x11::properties ()	395	rxvt_font_x11::properties ()
372	{	396	{
373	return properties (f);
374	}
375
376	rxvt_fontprop
377	rxvt_font_x11::properties (XFontStruct *f)
378	{
379	rxvt_fontprop p;	397	rxvt_fontprop p;
		398	set_properties (p, f);
		399	return p;
		400	}
380		401
		402	bool
		403	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		404	{
		405	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		406	p.height = height;
		407	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		408	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		409
		410	return true;
		411	}
		412
		413	bool
		414	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		415	{
381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	416	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382	const char *slant = get_property (f, "SLANT", "r");	417	const char *slant = get_property (f, "SLANT", "r");
383		418
		419	unsigned long height;
		420	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		421	return false;
		422
384	unsigned long avgwidth;	423	unsigned long avgwidth;
385	p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)	424	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
386	? avgwidth / 10	425	avgwidth = 0;
387	: (height + 1) / 2;
388	p.height = height;
389	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
390	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
391		426
392	return p;	427	return set_properties (p, height, weight, slant, avgwidth);
		428	}
		429
		430	bool
		431	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		432	{
		433	int slashes = 0;
		434	const char *comp[12];
		435
		436	for (const char c = name; c; c++)
		437	if (*c == '-')
		438	{
		439	comp[slashes++] = c + 1;
		440	if (slashes >= 13)
		441	break;
		442	}
		443
		444	/* can we short-circuit the costly XLoadQueryFont? */
		445	if (slashes >= 13
		446	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		447	&& (comp[11] >= '0' && comp[11] <= '9'))
		448	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		449
		450	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		451
		452	if (f)
		453	{
		454	// the font should really exist now. if not, we have a problem
		455	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		456	// in that case, just return garbage.
		457	bool ret = set_properties (p, f);
		458	XFreeFont (DISPLAY, f);
		459	return ret;
		460	}
		461	else
		462	return false;
		463	}
		464
		465	// fix the size of scalable fonts
		466	static void
		467	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		468	{
		469	int slashes = 0;
		470	const char *size;
		471
		472	for (const char c = name; c; c++)
		473	if (*c == '-')
		474	{
		475	if (slashes == 6)
		476	size = c + 1;
		477
		478	if (++slashes >= 13)
		479	break;
		480	}
		481
		482	if (slashes >= 13 && size[0] == '0')
		483	{
		484	strncpy (buf, name, size - name);
		485	buf += size - name;
		486	buf += sprintf (buf, "%d", prop.height);
		487	strcpy (buf, size + 1);
		488	}
		489	else
		490	strcpy (buf, name);
393	}	491	}
394		492
395	bool	493	bool
396	rxvt_font_x11::load (const rxvt_fontprop &prop)	494	rxvt_font_x11::load (const rxvt_fontprop &prop)
397	{	495	{
398	clear ();	496	clear ();
399		497
400	char **list;	498	char **list;
401	int count;	499	int count;
402	XFontStruct *info;
403	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	500	list = XListFonts (DISPLAY, name, 512, &count);
		501	set_name (0);
404		502
405	if (!list)	503	if (!list)
406	return false;	504	return false;
407		505
408	int bestdiff = 0x7fffffff;	506	int bestdiff = 0x7fffffff;
409	XFontStruct *best = 0;
410	for (int i = 0; i < count; i++)	507	for (int i = 0; i < count; i++)
411	{	508	{
412	XFontStruct *f = info + i;	509	rxvt_fontprop p;
		510	char fname[1024];
		511	fix_scalable (fname, list[i], prop);
413		512
		513	if (!set_properties (p, fname))
		514	continue;
		515
414	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	516	if (p.height > prop.height) // weed out too large fonts
415	{	517	continue;
416	rxvt_fontprop p = properties (f);	518
417	int diff = (prop.height - f->ascent + f->descent) * 32	519	int diff = (prop.height - p.height) * 32
418	+ abs (prop.weight - p.weight)	520	+ abs (prop.weight - p.weight)
419	+ abs (prop.slant - p.slant );	521	+ abs (prop.slant - p.slant );
420		522
421	if (!best // compare against best found so far	523	if (!name // compare against best found so far
422	\|\| diff < bestdiff)	524	\|\| diff < bestdiff)
423	{	525	{
424	best = f;	526	set_name (strdup (fname));
425	bestdiff = diff;	527	bestdiff = diff;
426	}	528	}
427	}
428	}	529	}
429		530
		531	XFreeFontNames (list);
		532
430	if (!best)	533	if (!name)
431	return false;	534	return false;
432
433	set_name (strdup (list[best - info]));
434
435	XFreeFontInfo (list, info, count);
436		535
437	f = XLoadQueryFont (DISPLAY, name);	536	f = XLoadQueryFont (DISPLAY, name);
438		537
439	if (!f)	538	if (!f)
440	return false;	539	return false;
441
442	unsigned long value;
443		540
444	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	541	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
445	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	542	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
446		543
447	if (registry && encoding)	544	if (registry && encoding)
…		…
534	/* check wether the character exists in _this_ font. horrible. */	631	/* check wether the character exists in _this_ font. horrible. */
535	XCharStruct *xcs;	632	XCharStruct *xcs;
536		633
537	if (encm)	634	if (encm)
538	{	635	{
539	int byte1 = ch >> 8;	636	unsigned char byte1 = ch >> 8;
540	int byte2 = ch & 255;	637	unsigned char byte2 = ch & 255;
541		638
542	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	639	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
543	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	640	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
544	return false;	641	return false;
545		642
…		…
568		665
569	return true;	666	return true;
570	}	667	}
571		668
572	void	669	void
573	rxvt_font_x11::draw (int x, int y,	670	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
574	const text_t *text, int len,	671	const text_t *text, int len,
575	int fg, int bg)	672	int fg, int bg)
576	{	673	{
577	// this looks like a mess /.	674	// this looks like a mess /.
578	// and it is a mess /.	675	// and it is a mess /.
…		…
594	{	691	{
595	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	692	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
596		693
597	if (bg == Color_bg && !slow)	694	if (bg == Color_bg && !slow)
598	{	695	{
599	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	696	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
600	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	697	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
601	}	698	}
602	else	699	else
603	{	700	{
604	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	701	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
605		702
606	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	703	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
607		704
608	if (slow)	705	if (slow)
609	{	706	{
610	do	707	do
611	{	708	{
612	if (xc->byte1 \|\| xc->byte2)	709	if (xc->byte1 \|\| xc->byte2)
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	710	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
614		711
615	x += r->TermWin.fwidth;	712	x += r->TermWin.fwidth;
616	xc++; len--;	713	xc++; len--;
617	}	714	}
618	while (len);	715	while (len);
619	}	716	}
620	else	717	else
621	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	718	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
622	}	719	}
623	}	720	}
624	else	721	else
625	{	722	{
626	const char *xc = enc_char (text, len, cs, slow);	723	const char *xc = enc_char (text, len, cs, slow);
627		724
628	if (bg == Color_bg && !slow)	725	if (bg == Color_bg && !slow)
629	{	726	{
630	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	727	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
631	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	728	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
632	}	729	}
633	else	730	else
634	{	731	{
635	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	732	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
636		733
637	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	734	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
638		735
639	if (slow)	736	if (slow)
640	{	737	{
641	do	738	do
642	{	739	{
643	if (*xc)	740	if (*xc)
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	741	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
645		742
646	x += r->TermWin.fwidth;	743	x += r->TermWin.fwidth;
647	xc++; len--;	744	xc++; len--;
648	}	745	}
649	while (len);	746	while (len);
650	}	747	}
651	else	748	else
652	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	749	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
653	}	750	}
654	}	751	}
655	}	752	}
656		753
657	/////////////////////////////////////////////////////////////////////////////	754	/////////////////////////////////////////////////////////////////////////////
…		…
662	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	759	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
663	#define SWATHBITS 8	760	#define SWATHBITS 8
664	#endif	761	#endif
665		762
666	struct rxvt_font_xft : rxvt_font {	763	struct rxvt_font_xft : rxvt_font {
667	rxvt_font_xft () { f = 0; d = 0; }	764	rxvt_font_xft () { f = 0; }
668		765
669	void clear ();	766	void clear ();
670		767
671	rxvt_fontprop properties ();	768	rxvt_fontprop properties ();
672		769
673	bool load (const rxvt_fontprop &prop);	770	bool load (const rxvt_fontprop &prop);
674		771
675	void draw (int x, int y,	772	void draw (rxvt_drawable &d, int x, int y,
676	const text_t *text, int len,	773	const text_t *text, int len,
677	int fg, int bg);	774	int fg, int bg);
678		775
679	bool has_codepoint (uint32_t unicode);	776	bool has_codepoint (uint32_t unicode);
680		777
681	protected:	778	protected:
682	XftFont *f;	779	XftFont *f;
683	XftDraw *d;
684	};	780	};
685		781
686	void	782	void
687	rxvt_font_xft::clear ()	783	rxvt_font_xft::clear ()
688	{	784	{
689	if (f)	785	if (f)
690	{	786	{
691	XftFontClose (DISPLAY, f);	787	XftFontClose (DISPLAY, f);
692	f = 0;	788	f = 0;
693	}
694
695	if (d)
696	{
697	XftDrawDestroy (d);
698	d = 0;
699	}	789	}
700	}	790	}
701		791
702	rxvt_fontprop	792	rxvt_fontprop
703	rxvt_font_xft::properties ()	793	rxvt_font_xft::properties ()
…		…
736	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	826	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
737		827
738	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	828	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
739	FcPatternAddInteger (p, FC_SLANT, prop.slant);	829	FcPatternAddInteger (p, FC_SLANT, prop.slant);
740		830
		831	#if 0 // clipping unfortunately destroys our precious double-width-characters
741	// clip width, we can't do better, or can we?	832	// clip width, we can't do better, or can we?
742	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)	833	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
743	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);	834	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		835	#endif
744		836
745	//FcPatternAddBool (p, FC_MINSPACE, 1);	837	//FcPatternAddBool (p, FC_MINSPACE, 1);
746		838
747	XftResult result;	839	XftResult result;
748	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	840	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
…		…
808	{	900	{
809	return XftCharExists (DISPLAY, f, unicode);	901	return XftCharExists (DISPLAY, f, unicode);
810	}	902	}
811		903
812	void	904	void
813	rxvt_font_xft::draw (int x, int y,	905	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
814	const text_t *text, int len,	906	const text_t *text, int len,
815	int fg, int bg)	907	int fg, int bg)
816	{	908	{
817	if (!d)
818	{
819	dR;
820	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
821	}
822
823	if (bg >= 0 && bg != Color_bg)
824	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
825	else
826	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	909	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
827		910
828	if (!slow && width == r->TermWin.fwidth)	911	if (!slow && width == r->TermWin.fwidth && 0)
829	{	912	{
830	if (sizeof (text_t) == sizeof (FcChar16))	913	if (sizeof (text_t) == sizeof (FcChar16))
831	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	914	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
832	else	915	else
833	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	916	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
836	{	919	{
837	while (len)	920	while (len)
838	{	921	{
839	if (text != NOCHAR && text != ' ')	922	if (text != NOCHAR && text != ' ')
840	{	923	{
		924	int fwidth = r->TermWin.fwidth;
		925	if (len >= 2 && text[1] == NOCHAR)
		926	fwidth *= 2;
		927
		928	XGlyphInfo extents;
841	if (sizeof (text_t) == sizeof (FcChar16))	929	if (sizeof (text_t) == sizeof (FcChar16))
842	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	930	{
		931	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		932	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		933	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		934	}
843	else	935	else
844	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	936	{
		937	XGlyphInfo extents;
		938	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		939	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		940	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		941	}
845	}	942	}
846		943
847	x += r->TermWin.fwidth;	944	x += r->TermWin.fwidth;
848	text++;	945	text++;
849	len--;	946	len--;
…		…
853	#endif	950	#endif
854		951
855	/////////////////////////////////////////////////////////////////////////////	952	/////////////////////////////////////////////////////////////////////////////
856		953
857	rxvt_fontset::rxvt_fontset (rxvt_t r)	954	rxvt_fontset::rxvt_fontset (rxvt_t r)
858	#ifdef EXPLICIT_CONTEXT
859	: r(r)	955	: r (r)
860	#endif
861	{	956	{
862	clear ();	957	clear ();
863	}	958	}
864		959
865	rxvt_fontset::~rxvt_fontset ()	960	rxvt_fontset::~rxvt_fontset ()
…		…
868	}	963	}
869		964
870	void	965	void
871	rxvt_fontset::clear ()	966	rxvt_fontset::clear ()
872	{	967	{
873	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	968	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
874	FONT_UNREF (*i);	969	FONT_UNREF (*i);
875		970
876	fonts.clear ();	971	fonts.clear ();
877	base_id = 0;	972	base_id = 0;
878	base_prop.height = 0x7fffffff;	973	base_prop.height = 0x7fffffff;
…		…
932		1027
933	if (*desc == '[')	1028	if (*desc == '[')
934	{	1029	{
935	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1030	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
936		1031
937	const char *extra = desc++;	1032	//const char *extra = desc++; // not yet used
938		1033
939	desc = strchr (desc, ']');	1034	desc = strchr (desc, ']');
940		1035
941	if (!desc)	1036	if (!desc)
942	{	1037	{
…		…
981	}	1076	}
982		1077
983	return true;	1078	return true;
984	}	1079	}
985		1080
986	void	1081	bool
987	rxvt_fontset::populate (const char *desc)	1082	rxvt_fontset::populate (const char *desc)
988	{	1083	{
989	clear ();	1084	clear ();
990		1085
991	fonts.push_back (new_font (0, CS_UNICODE));	1086	fonts.push_back (new_font (0, CS_UNICODE));
…		…
995		1090
996	if (!base_id)	1091	if (!base_id)
997	base_id = 1;	1092	base_id = 1;
998		1093
999	// we currently need a base-font, no matter what	1094	// we currently need a base-font, no matter what
1000	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1095	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1001	{	1096	{
		1097	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1002	add_fonts ("fixed");	1098	add_fonts ("fixed");
1003	base_id = fonts.size () - 1;	1099	base_id = fonts.size () - 1;
1004	}	1100	}
1005		1101
1006	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1102	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1007	{	1103	return false;
1008	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1009	exit (1);
1010	}
1011		1104
1012	base_prop = fonts[base_id]->properties ();	1105	base_prop = fonts[base_id]->properties ();
		1106
		1107	return true;
1013	}	1108	}
1014		1109
1015	int	1110	int
1016	rxvt_fontset::find_font (uint32_t unicode)	1111	rxvt_fontset::find_font (uint32_t unicode)
1017	{	1112	{
1018	for (int i = 0; i < fonts.size (); i++)	1113	for (unsigned int i = 0; i < fonts.size (); i++)
1019	{	1114	{
1020	rxvt_font *f = fonts[i];	1115	rxvt_font *f = fonts[i];
1021		1116
1022	if (!f->loaded)	1117	if (!f->loaded)
1023	{	1118	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs. Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.10 by pcg, Wed Dec 24 09:07:01 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC