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

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.32 by pcg, Thu Mar 4 00:59:10 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.32 by pcg, Thu Mar 4 00:59:10 2004 UTC