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

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.25 by pcg, Tue Feb 24 23:58:12 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.25 by pcg, Tue Feb 24 23:58:12 2004 UTC