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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.27 by pcg, Wed Mar 3 00:20:33 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_EXT, "-----------c--big5-0" },
		78	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "-----------c-*-cns11643.1992-1" },	79	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "-----------c-*-cns11643.1992-2" },	80	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "-----------c-*-cns11643.1992-3" },	81	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "-----------c-*-cns11643.1992-4" },	82	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "-----------c-*-cns11643.1992-5" },	83	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "-----------c-*-cns11643.1992-6" },	84	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "-----------c-*-cns11643.1992-7" },	85	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "-----------c-*-cns11643.1992-f" },	86	{ CS_CNS11643_1992_F, "-----------c--cns11643-f" },
86	#endif	87	#endif
87		88
88	#if XFT	89	#if XFT
89	{ CS_UNICODE, "xft:Andale Mono" },	90	{ CS_UNICODE, "xft:Andale Mono" },
90	{ CS_UNICODE, "xft:Arial Unicode MS" },	91	{ CS_UNICODE, "xft:Arial Unicode MS" },
…		…
98	{ CS_UNKNOWN, 0 }	99	{ CS_UNKNOWN, 0 }
99	};	100	};
100		101
101	/////////////////////////////////////////////////////////////////////////////	102	/////////////////////////////////////////////////////////////////////////////
102		103
		104	#if XFT
		105	rxvt_drawable::~rxvt_drawable ()
		106	{
		107	if (xftdrawable)
		108	XftDrawDestroy (xftdrawable);
		109	}
		110
		111	rxvt_drawable::operator XftDraw *()
		112	{
		113	if (!xftdrawable)
		114	xftdrawable = XftDrawCreate (display->display, drawable, display->visual, display->cmap);
		115
		116	return xftdrawable;
		117	}
		118	#endif
		119
		120	/////////////////////////////////////////////////////////////////////////////
		121
103	static void *enc_buf;	122	static void *enc_buf;
104	static uint32_t enc_len;	123	static uint32_t enc_len;
105		124
106	static inline void *	125	static inline void *
107	get_enc_buf (int len)	126	get_enc_buf (uint32_t len)
108	{	127	{
109	if (len > enc_len)	128	if (len > enc_len)
110	{	129	{
111	free (enc_buf);	130	free (enc_buf);
112	enc_buf = malloc (len);	131	enc_buf = malloc (len);
…		…
114		133
115	return enc_buf;	134	return enc_buf;
116	}	135	}
117		136
118	static const char *	137	static const char *
119	enc_char (const text_t *text, int len, codeset cs, bool &zero)	138	enc_char (const text_t *text, uint32_t len, codeset cs, bool &zero)
120	{	139	{
121	uint8_t buf = (uint8_t )get_enc_buf (len);	140	uint8_t buf = (uint8_t )get_enc_buf (len);
122		141
123	while (len--)	142	while (len--)
124	{	143	{
…		…
135		154
136	return (const char *)enc_buf;	155	return (const char *)enc_buf;
137	}	156	}
138		157
139	static const XChar2b *	158	static const XChar2b *
140	enc_xchar2b (const text_t *text, int len, codeset cs, bool &zero)	159	enc_xchar2b (const text_t *text, uint32_t len, codeset cs, bool &zero)
141	{	160	{
142	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));	161	XChar2b buf = (XChar2b )get_enc_buf (len * sizeof (XChar2b));
143		162
144	while (len--)	163	while (len--)
145	{	164	{
…		…
160	}	179	}
161		180
162	/////////////////////////////////////////////////////////////////////////////	181	/////////////////////////////////////////////////////////////////////////////
163		182
164	void	183	void
165	rxvt_font::clear_rect (int x, int y, int w, int h, int color)	184	rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
166	{	185	{
167	if (color == Color_bg)	186	if (color == Color_bg)
168	XClearArea (DISPLAY, DRAWABLE, x, y, w, h, FALSE);	187	XClearArea (d.display->display, d, x, y, w, h, FALSE);
169	else if (color >= 0)	188	else if (color >= 0)
170	{	189	{
		190	#if XFT
		191	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
		192	#else
171	XSetForeground (DISPLAY, GC, r->PixColors[color]);	193	XSetForeground (d.display->display, GC, r->PixColors[color]);
172	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	194	XFillRectangle (d.display->display, d, GC, x, y, w, h);
		195	#endif
173	}	196	}
174	}	197	}
175		198
176	static const char *linedraw_cmds[128] = {	199	static const char *linedraw_cmds[128] = {
177	"1hH", "2hH", "1vV", "2vV",	200	"1hH", "2hH", "1vV", "2vV",
…		…
227	struct rxvt_font_default : rxvt_font {	250	struct rxvt_font_default : rxvt_font {
228	rxvt_fontprop properties ()	251	rxvt_fontprop properties ()
229	{	252	{
230	rxvt_fontprop p;	253	rxvt_fontprop p;
231		254
232	p.height = 1;	255	p.width = p.height = 1;
233	p.weight = rxvt_fontprop::medium;	256	p.weight = rxvt_fontprop::medium;
234	p.slant = rxvt_fontprop::roman;	257	p.slant = rxvt_fontprop::roman;
235		258
236	return p;	259	return p;
237	}	260	}
…		…
262	}	285	}
263		286
264	return false;	287	return false;
265	}	288	}
266		289
267	void draw (int x, int y,	290	void draw (rxvt_drawable &d, int x, int y,
268	const text_t *text, int len,	291	const text_t *text, int len,
269	int fg, int bg);	292	int fg, int bg);
270	};	293	};
271		294
272	void	295	void
273	rxvt_font_default::draw (int x, int y,	296	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274	const text_t *text, int len,	297	const text_t *text, int len,
275	int fg, int bg)	298	int fg, int bg)
276	{	299	{
277	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	300	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278		301
279	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	302	XSetForeground (d.display->display, GC, r->PixColors[fg]);
280		303
281	while (len--)	304	while (len--)
282	{	305	{
283	text_t t = *text++;	306	text_t t = *text++;
284		307
		308	// is it in our linedrawing table?
285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	309	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286	{	310	{
287	const char *p = linedraw_cmds[t - 0x2500];	311	const char *p = linedraw_cmds[t - 0x2500];
288		312
289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	313	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;	314	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
291		315
292	XGCValues gcv;	316	XGCValues gcv;
293		317
294	while (*p)	318	while (*p)
295	{	319	{
296	switch (*p++)	320	switch (*p++)
297	{	321	{
298	case '1':	322	case '1':
299	gcv.line_width = 0;	323	gcv.line_width = 0;
300	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	324	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301	break;	325	break;
302		326
303	case '2':	327	case '2':
304	gcv.line_width = 2;	328	gcv.line_width = 2;
305	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	329	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306	break;	330	break;
307		331
308	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	332	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;	333	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;	334	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;	335	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;	336	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;	337	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314	}	338	}
315	}	339	}
316		340
317	gcv.line_width = 0;	341	gcv.line_width = 0;
318	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	342	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
319	}	343	}
320	else	344	else
321	switch (*text++)	345	switch (t)
322	{	346	{
323	case NOCHAR:
324	case ZERO_WIDTH_CHAR:	347	case ZERO_WIDTH_CHAR:
325	break;	348	break;
326	default:	349	default:
327	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	350	int w = 0;
		351	while (len > 0 && *text == NOCHAR)
		352	{
		353	++text;
		354	--len;
		355	w += r->TermWin.fwidth;
		356	}
		357
		358	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
		359	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
		360	x += w;
328	}	361	}
329		362
330	x += r->TermWin.fwidth;	363	x += r->TermWin.fwidth;
331	}	364	}
332	}	365	}
…		…
337	rxvt_font_x11 () { f = 0; }	370	rxvt_font_x11 () { f = 0; }
338		371
339	void clear ();	372	void clear ();
340		373
341	rxvt_fontprop properties ();	374	rxvt_fontprop properties ();
342	rxvt_fontprop properties (XFontStruct *f);
343		375
344	bool load (const rxvt_fontprop &prop);	376	bool load (const rxvt_fontprop &prop);
345		377
346	bool has_codepoint (uint32_t unicode);	378	bool has_codepoint (uint32_t unicode);
347		379
348	void draw (int x, int y,	380	void draw (rxvt_drawable &d, int x, int y,
349	const text_t *text, int len,	381	const text_t *text, int len,
350	int fg, int bg);	382	int fg, int bg);
351		383
352	XFontStruct *f;	384	XFontStruct *f;
353	codeset cs;	385	codeset cs;
354	bool enc2b, encm;	386	bool enc2b, encm;
355		387
356	const char get_property (XFontStruct f, const char property, const char repl) const;	388	const char get_property (XFontStruct f, const char property, const char repl) const;
		389	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		390	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		391	bool set_properties (rxvt_fontprop &p, const char *name);
357	};	392	};
358		393
359	const char *	394	const char *
360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	395	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
361	{	396	{
…		…
368	}	403	}
369		404
370	rxvt_fontprop	405	rxvt_fontprop
371	rxvt_font_x11::properties ()	406	rxvt_font_x11::properties ()
372	{	407	{
373	return properties (f);
374	}
375
376	rxvt_fontprop
377	rxvt_font_x11::properties (XFontStruct *f)
378	{
379	rxvt_fontprop p;	408	rxvt_fontprop p;
		409	set_properties (p, f);
		410	return p;
		411	}
380		412
		413	bool
		414	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		415	{
		416	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		417	p.height = height;
		418	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		419	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		420
		421	return true;
		422	}
		423
		424	bool
		425	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		426	{
381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	427	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382	const char *slant = get_property (f, "SLANT", "r");	428	const char *slant = get_property (f, "SLANT", "r");
383		429
384	p.height = height;	430	unsigned long height;
385	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	431	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
386	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	432	return false;
387		433
388	return p;	434	unsigned long avgwidth;
		435	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		436	avgwidth = 0;
		437
		438	return set_properties (p, height, weight, slant, avgwidth);
		439	}
		440
		441	bool
		442	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		443	{
		444	int slashes = 0;
		445	const char *comp[12];
		446
		447	for (const char c = name; c; c++)
		448	if (*c == '-')
		449	{
		450	comp[slashes++] = c + 1;
		451	if (slashes >= 13)
		452	break;
		453	}
		454
		455	/* can we short-circuit the costly XLoadQueryFont? */
		456	if (slashes >= 13
		457	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		458	&& (comp[11] >= '0' && comp[11] <= '9'))
		459	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		460
		461	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		462
		463	if (f)
		464	{
		465	// the font should really exist now. if not, we have a problem
		466	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		467	// in that case, just return garbage.
		468	bool ret = set_properties (p, f);
		469	XFreeFont (DISPLAY, f);
		470	return ret;
		471	}
		472	else
		473	return false;
		474	}
		475
		476	// fix the size of scalable fonts
		477	static void
		478	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		479	{
		480	int slashes = 0;
		481	const char *size;
		482
		483	for (const char c = name; c; c++)
		484	if (*c == '-')
		485	{
		486	if (slashes == 6)
		487	size = c + 1;
		488
		489	if (++slashes >= 13)
		490	break;
		491	}
		492
		493	if (slashes >= 13 && size[0] == '0')
		494	{
		495	strncpy (buf, name, size - name);
		496	buf += size - name;
		497	buf += sprintf (buf, "%d", prop.height);
		498	strcpy (buf, size + 1);
		499	}
		500	else
		501	strcpy (buf, name);
389	}	502	}
390		503
391	bool	504	bool
392	rxvt_font_x11::load (const rxvt_fontprop &prop)	505	rxvt_font_x11::load (const rxvt_fontprop &prop)
393	{	506	{
394	clear ();	507	clear ();
395		508
396	char **list;	509	char **list;
397	int count;	510	int count;
398	XFontStruct *info;
399	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	511	list = XListFonts (DISPLAY, name, 512, &count);
		512	set_name (0);
400		513
401	if (!list)	514	if (!list)
402	return false;	515	return false;
403		516
404	int bestdiff = 0x7fffffff;	517	int bestdiff = 0x7fffffff;
405	XFontStruct *best = 0;
406	for (int i = 0; i < count; i++)	518	for (int i = 0; i < count; i++)
407	{	519	{
408	XFontStruct *f = info + i;	520	rxvt_fontprop p;
		521	char fname[1024];
		522	fix_scalable (fname, list[i], prop);
409		523
		524	if (!set_properties (p, fname))
		525	continue;
		526
410	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	527	if (p.height > prop.height) // weed out too large fonts
411	{	528	continue;
412	rxvt_fontprop p = properties (f);	529
413	int diff = (prop.height - f->ascent + f->descent) * 32	530	int diff = (prop.height - p.height) * 32
414	+ abs (prop.weight - p.weight)	531	+ abs (prop.weight - p.weight)
415	+ abs (prop.slant - p.slant );	532	+ abs (prop.slant - p.slant );
416		533
417	if (!best // compare against best found so far	534	if (!name // compare against best found so far
418	\|\| diff < bestdiff)	535	\|\| diff < bestdiff)
419	{	536	{
420	best = f;	537	set_name (strdup (fname));
421	bestdiff = diff;	538	bestdiff = diff;
422	}	539	}
423	}
424	}	540	}
425		541
		542	XFreeFontNames (list);
		543
426	if (!best)	544	if (!name)
427	return false;	545	return false;
428
429	set_name (strdup (list[best - info]));
430
431	XFreeFontInfo (list, info, count);
432		546
433	f = XLoadQueryFont (DISPLAY, name);	547	f = XLoadQueryFont (DISPLAY, name);
434		548
435	if (!f)	549	if (!f)
436	return false;	550	return false;
437
438	unsigned long value;
439		551
440	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	552	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
441	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	553	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
442		554
443	if (registry && encoding)	555	if (registry && encoding)
…		…
530	/* check wether the character exists in _this_ font. horrible. */	642	/* check wether the character exists in _this_ font. horrible. */
531	XCharStruct *xcs;	643	XCharStruct *xcs;
532		644
533	if (encm)	645	if (encm)
534	{	646	{
535	int byte1 = ch >> 8;	647	unsigned char byte1 = ch >> 8;
536	int byte2 = ch & 255;	648	unsigned char byte2 = ch & 255;
537		649
538	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	650	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
539	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	651	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
540	return false;	652	return false;
541		653
…		…
564		676
565	return true;	677	return true;
566	}	678	}
567		679
568	void	680	void
569	rxvt_font_x11::draw (int x, int y,	681	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
570	const text_t *text, int len,	682	const text_t *text, int len,
571	int fg, int bg)	683	int fg, int bg)
572	{	684	{
573	// this looks like a mess /.	685	// this looks like a mess /.
574	// and it is a mess /.	686	// and it is a mess /.
…		…
590	{	702	{
591	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	703	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
592		704
593	if (bg == Color_bg && !slow)	705	if (bg == Color_bg && !slow)
594	{	706	{
595	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	707	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
596	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	708	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
597	}	709	}
598	else	710	else
599	{	711	{
600	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	712	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
601		713
602	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	714	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
603		715
604	if (slow)	716	if (slow)
605	{	717	{
606	do	718	do
607	{	719	{
608	if (xc->byte1 \|\| xc->byte2)	720	if (xc->byte1 \|\| xc->byte2)
609	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	721	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
610		722
611	x += r->TermWin.fwidth;	723	x += r->TermWin.fwidth;
612	xc++; len--;	724	xc++; len--;
613	}	725	}
614	while (len);	726	while (len);
615	}	727	}
616	else	728	else
617	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	729	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
618	}	730	}
619	}	731	}
620	else	732	else
621	{	733	{
622	const char *xc = enc_char (text, len, cs, slow);	734	const char *xc = enc_char (text, len, cs, slow);
623		735
624	if (bg == Color_bg && !slow)	736	if (bg == Color_bg && !slow)
625	{	737	{
626	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	738	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
627	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	739	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
628	}	740	}
629	else	741	else
630	{	742	{
631	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	743	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
632		744
633	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	745	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
634		746
635	if (slow)	747	if (slow)
636	{	748	{
637	do	749	do
638	{	750	{
639	if (*xc)	751	if (*xc)
640	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	752	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
641		753
642	x += r->TermWin.fwidth;	754	x += r->TermWin.fwidth;
643	xc++; len--;	755	xc++; len--;
644	}	756	}
645	while (len);	757	while (len);
646	}	758	}
647	else	759	else
648	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	760	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
649	}	761	}
650	}	762	}
651	}	763	}
652		764
653	/////////////////////////////////////////////////////////////////////////////	765	/////////////////////////////////////////////////////////////////////////////
…		…
658	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	770	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
659	#define SWATHBITS 8	771	#define SWATHBITS 8
660	#endif	772	#endif
661		773
662	struct rxvt_font_xft : rxvt_font {	774	struct rxvt_font_xft : rxvt_font {
663	#if 0
664	enum {
665	SWATHCOUNT = 1 << (21 - UNIBITS),
666	SWATHSIZE = 1 << (SWATHBITS - 5)
667	};
668	typedef uint32_t swath[SWATHSIZE];
669
670	swath *cvr[SWATHCOUNT];
671	#endif
672
673	#if 0
674	void gen_coverage_swath (unsigned int page);
675
676	bool has_char (uint32_t ch)
677	{
678	unsigned int page = ch >> SWATHBITS;
679	unsigned int idx = ch & ((1 << SWATHBITS) - 1);
680
681	if (page >= SWATHCOUNT)
682	return false;
683
684	if (!cvr[page]) gen_coverage_swath (page);
685
686	return cvr[page][idx >> 5] & (1 << (idx & 31));
687	}
688	#endif
689	rxvt_font_xft () { f = 0; d = 0; }	775	rxvt_font_xft () { f = 0; }
690		776
691	void clear ();	777	void clear ();
692		778
693	rxvt_fontprop properties ();	779	rxvt_fontprop properties ();
694		780
695	bool load (const rxvt_fontprop &prop);	781	bool load (const rxvt_fontprop &prop);
696		782
697	void draw (int x, int y,	783	void draw (rxvt_drawable &d, int x, int y,
698	const text_t *text, int len,	784	const text_t *text, int len,
699	int fg, int bg);	785	int fg, int bg);
700		786
701	bool has_codepoint (uint32_t unicode);	787	bool has_codepoint (uint32_t unicode);
702		788
703	protected:	789	protected:
704	XftFont *f;	790	XftFont *f;
705	XftDraw *d;
706
707	#if 0
708	virtual void populate_coverage_swath (uint32_t lo, uint32_t hi) = 0;
709	void set_swath (uint32_t ch)
710	{
711	cvr[ch >> SWATHBITS] \|= 1 << (ch & ((1 << SWATHBITS) - 1));
712	}
713	#endif
714	};	791	};
715		792
716	void	793	void
717	rxvt_font_xft::clear ()	794	rxvt_font_xft::clear ()
718	{	795	{
719	if (f)	796	if (f)
720	{	797	{
721	XftFontClose (DISPLAY, f);	798	XftFontClose (DISPLAY, f);
722	f = 0;	799	f = 0;
723	}	800	}
724
725	if (d)
726	{
727	XftDrawDestroy (d);
728	d = 0;
729	}
730
731	#if 0
732	for (int i = 0; i < SWATHCOUNT; i++)
733	delete cvr[i];
734	#endif
735	}	801	}
736		802
737	rxvt_fontprop	803	rxvt_fontprop
738	rxvt_font_xft::properties ()	804	rxvt_font_xft::properties ()
739	{	805	{
740	rxvt_fontprop p;	806	rxvt_fontprop p;
741		807
742	FT_Face face = XftLockFace (f);	808	FT_Face face = XftLockFace (f);
743		809
744	p.height = height;	810	p.width = width; p.height = height;
745	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	811	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;
746	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;	812	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747		813
748	XftUnlockFace (f);	814	XftUnlockFace (f);
749		815
…		…
771	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	837	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772		838
773	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	839	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774	FcPatternAddInteger (p, FC_SLANT, prop.slant);	840	FcPatternAddInteger (p, FC_SLANT, prop.slant);
775		841
		842	#if 0 // clipping unfortunately destroys our precious double-width-characters
		843	// clip width, we can't do better, or can we?
		844	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		845	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		846	#endif
		847
776	//FcPatternAddBool (p, FC_MINSPACE, 1);	848	//FcPatternAddBool (p, FC_MINSPACE, 1);
777		849
778	XftResult result;	850	XftResult result;
779	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	851	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
780		852
…		…
832	XftUnlockFace (f);	904	XftUnlockFace (f);
833		905
834	return true;	906	return true;
835	}	907	}
836		908
837	#if 0
838	void rxvt_font::gen_coverage_swath (unsigned int page)
839	{
840	cvr[page] = new swath;
841
842	for (int i = 0; i < SWATHSIZE; i++)
843	cvr[page][i] = 0;
844
845	populate_coverage_swath (cvr[page], page << SWATHBITS, ((page + 1) << SWATHBITS) - 1);
846	}
847	#endif
848
849	bool	909	bool
850	rxvt_font_xft::has_codepoint (uint32_t unicode)	910	rxvt_font_xft::has_codepoint (uint32_t unicode)
851	{	911	{
852	return XftCharExists (DISPLAY, f, unicode);	912	return XftCharExists (DISPLAY, f, unicode);
853	}	913	}
854		914
855	void	915	void
856	rxvt_font_xft::draw (int x, int y,	916	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
857	const text_t *text, int len,	917	const text_t *text, int len,
858	int fg, int bg)	918	int fg, int bg)
859	{	919	{
860	if (!d)
861	{
862	dR;
863	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
864	}
865
866	if (bg >= 0 && bg != Color_bg)
867	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
868	else
869	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	920	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
870		921
871	if (!slow && width == r->TermWin.fwidth)	922	if (!slow && width == r->TermWin.fwidth && 0)
872	{	923	{
873	if (sizeof (text_t) == sizeof (FcChar16))	924	if (sizeof (text_t) == sizeof (FcChar16))
874	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	925	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
875	else	926	else
876	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	927	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
879	{	930	{
880	while (len)	931	while (len)
881	{	932	{
882	if (text != NOCHAR && text != ' ')	933	if (text != NOCHAR && text != ' ')
883	{	934	{
		935	int fwidth = r->TermWin.fwidth;
		936	if (len >= 2 && text[1] == NOCHAR)
		937	fwidth *= 2;
		938
		939	XGlyphInfo extents;
884	if (sizeof (text_t) == sizeof (FcChar16))	940	if (sizeof (text_t) == sizeof (FcChar16))
885	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	941	{
		942	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		943	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		944	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		945	}
886	else	946	else
887	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	947	{
		948	XGlyphInfo extents;
		949	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		950	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		951	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		952	}
888	}	953	}
889		954
890	x += r->TermWin.fwidth;	955	x += r->TermWin.fwidth;
891	text++;	956	text++;
892	len--;	957	len--;
…		…
896	#endif	961	#endif
897		962
898	/////////////////////////////////////////////////////////////////////////////	963	/////////////////////////////////////////////////////////////////////////////
899		964
900	rxvt_fontset::rxvt_fontset (rxvt_t r)	965	rxvt_fontset::rxvt_fontset (rxvt_t r)
901	#ifdef EXPLICIT_CONTEXT
902	: r(r)	966	: r (r)
903	#endif
904	{	967	{
905	clear ();	968	clear ();
906	}	969	}
907		970
908	rxvt_fontset::~rxvt_fontset ()	971	rxvt_fontset::~rxvt_fontset ()
…		…
911	}	974	}
912		975
913	void	976	void
914	rxvt_fontset::clear ()	977	rxvt_fontset::clear ()
915	{	978	{
916	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	979	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
917	FONT_UNREF (*i);	980	FONT_UNREF (*i);
918		981
919	fonts.clear ();	982	fonts.clear ();
920	base_id = 0;	983	base_id = 0;
921	base_prop.height = 0x7fffffff;	984	base_prop.height = 0x7fffffff;
…		…
975		1038
976	if (*desc == '[')	1039	if (*desc == '[')
977	{	1040	{
978	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1041	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
979		1042
980	const char *extra = desc++;	1043	//const char *extra = desc++; // not yet used
981		1044
982	desc = strchr (desc, ']');	1045	desc = strchr (desc, ']');
983		1046
984	if (!desc)	1047	if (!desc)
985	{	1048	{
…		…
1024	}	1087	}
1025		1088
1026	return true;	1089	return true;
1027	}	1090	}
1028		1091
1029	void	1092	bool
1030	rxvt_fontset::populate (const char *desc)	1093	rxvt_fontset::populate (const char *desc)
1031	{	1094	{
1032	clear ();	1095	clear ();
1033		1096
1034	fonts.push_back (new_font (0, CS_UNICODE));	1097	fonts.push_back (new_font (0, CS_UNICODE));
…		…
1038		1101
1039	if (!base_id)	1102	if (!base_id)
1040	base_id = 1;	1103	base_id = 1;
1041		1104
1042	// we currently need a base-font, no matter what	1105	// we currently need a base-font, no matter what
1043	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1106	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1044	{	1107	{
		1108	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1045	add_fonts ("fixed");	1109	add_fonts ("fixed");
1046	base_id = fonts.size () - 1;	1110	base_id = fonts.size () - 1;
1047	}	1111	}
1048		1112
1049	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1113	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1050	{	1114	return false;
1051	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1052	exit (1);
1053	}
1054		1115
1055	base_prop = fonts[base_id]->properties ();	1116	base_prop = fonts[base_id]->properties ();
		1117
		1118	return true;
1056	}	1119	}
1057		1120
1058	int	1121	int
1059	rxvt_fontset::find_font (uint32_t unicode)	1122	rxvt_fontset::find_font (uint32_t unicode)
1060	{	1123	{
1061	for (int i = 0; i < fonts.size (); i++)	1124	for (unsigned int i = 0; i < fonts.size (); i++)
1062	{	1125	{
1063	rxvt_font *f = fonts[i];	1126	rxvt_font *f = fonts[i];
1064		1127
1065	if (!f->loaded)	1128	if (!f->loaded)
1066	{	1129	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs. Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.9 by pcg, Wed Dec 24 06:26:52 2003 UTC vs.
Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC