[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.30 by pcg, Wed Mar 3 23:06:58 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",
…		…
227	struct rxvt_font_default : rxvt_font {	256	struct rxvt_font_default : rxvt_font {
228	rxvt_fontprop properties ()	257	rxvt_fontprop properties ()
229	{	258	{
230	rxvt_fontprop p;	259	rxvt_fontprop p;
231		260
232	p.height = 1;	261	p.width = p.height = 1;
233	p.weight = rxvt_fontprop::medium;	262	p.weight = rxvt_fontprop::medium;
234	p.slant = rxvt_fontprop::roman;	263	p.slant = rxvt_fontprop::roman;
235		264
236	return p;	265	return p;
237	}	266	}
…		…
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 / 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 / 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
384	p.height = height;	436	unsigned long height;
385	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;	437	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
386	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;	438	return false;
387		439
388	return p;	440	unsigned long avgwidth;
		441	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
		442	avgwidth = 0;
		443
		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);
389	}	508	}
390		509
391	bool	510	bool
392	rxvt_font_x11::load (const rxvt_fontprop &prop)	511	rxvt_font_x11::load (const rxvt_fontprop &prop)
393	{	512	{
394	clear ();	513	clear ();
395		514
396	char **list;	515	char **list;
397	int count;	516	int count;
398	XFontStruct *info;
399	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	517	list = XListFonts (DISPLAY, name, 512, &count);
		518	set_name (0);
400		519
401	if (!list)	520	if (!list)
402	return false;	521	return false;
403		522
404	int bestdiff = 0x7fffffff;	523	int bestdiff = 0x7fffffff;
405	XFontStruct *best = 0;
406	for (int i = 0; i < count; i++)	524	for (int i = 0; i < count; i++)
407	{	525	{
408	XFontStruct *f = info + i;	526	rxvt_fontprop p;
		527	char fname[1024];
		528	fix_scalable (fname, list[i], prop);
409		529
		530	if (!set_properties (p, fname))
		531	continue;
		532
410	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	533	if (p.height > prop.height) // weed out too large fonts
411	{	534	continue;
412	rxvt_fontprop p = properties (f);	535
413	int diff = (prop.height - f->ascent + f->descent) * 32	536	int diff = (prop.height - p.height) * 32
414	+ abs (prop.weight - p.weight)	537	+ abs (prop.weight - p.weight)
415	+ abs (prop.slant - p.slant );	538	+ abs (prop.slant - p.slant );
416		539
417	if (!best // compare against best found so far	540	if (!name // compare against best found so far
418	\|\| diff < bestdiff)	541	\|\| diff < bestdiff)
419	{	542	{
420	best = f;	543	set_name (strdup (fname));
421	bestdiff = diff;	544	bestdiff = diff;
422	}	545	}
423	}
424	}	546	}
425		547
		548	XFreeFontNames (list);
		549
426	if (!best)	550	if (!name)
427	return false;	551	return false;
428
429	set_name (strdup (list[best - info]));
430
431	XFreeFontInfo (list, info, count);
432		552
433	f = XLoadQueryFont (DISPLAY, name);	553	f = XLoadQueryFont (DISPLAY, name);
434		554
435	if (!f)	555	if (!f)
436	return false;	556	return false;
437
438	unsigned long value;
439		557
440	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	558	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
441	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	559	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
442		560
443	if (registry && encoding)	561	if (registry && encoding)
…		…
530	/* check wether the character exists in _this_ font. horrible. */	648	/* check wether the character exists in _this_ font. horrible. */
531	XCharStruct *xcs;	649	XCharStruct *xcs;
532		650
533	if (encm)	651	if (encm)
534	{	652	{
535	int byte1 = ch >> 8;	653	unsigned char byte1 = ch >> 8;
536	int byte2 = ch & 255;	654	unsigned char byte2 = ch & 255;
537		655
538	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	656	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
539	\|\| 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)
540	return false;	658	return false;
541		659
…		…
564		682
565	return true;	683	return true;
566	}	684	}
567		685
568	void	686	void
569	rxvt_font_x11::draw (int x, int y,	687	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
570	const text_t *text, int len,	688	const text_t *text, int len,
571	int fg, int bg)	689	int fg, int bg)
572	{	690	{
573	// this looks like a mess /.	691	// this looks like a mess /.
574	// and it is a mess /.	692	// and it is a mess /.
…		…
590	{	708	{
591	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	709	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
592		710
593	if (bg == Color_bg && !slow)	711	if (bg == Color_bg && !slow)
594	{	712	{
595	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	713	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
596	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	714	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
597	}	715	}
598	else	716	else
599	{	717	{
600	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);
601		719
602	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	720	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
603		721
604	if (slow)	722	if (slow)
605	{	723	{
606	do	724	do
607	{	725	{
608	if (xc->byte1 \|\| xc->byte2)	726	if (xc->byte1 \|\| xc->byte2)
609	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	727	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
610		728
611	x += r->TermWin.fwidth;	729	x += r->TermWin.fwidth;
612	xc++; len--;	730	xc++; len--;
613	}	731	}
614	while (len);	732	while (len);
615	}	733	}
616	else	734	else
617	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	735	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
618	}	736	}
619	}	737	}
620	else	738	else
621	{	739	{
622	const char *xc = enc_char (text, len, cs, slow);	740	const char *xc = enc_char (text, len, cs, slow);
623		741
624	if (bg == Color_bg && !slow)	742	if (bg == Color_bg && !slow)
625	{	743	{
626	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	744	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
627	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	745	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
628	}	746	}
629	else	747	else
630	{	748	{
631	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);
632		750
633	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	751	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
634		752
635	if (slow)	753	if (slow)
636	{	754	{
637	do	755	do
638	{	756	{
639	if (*xc)	757	if (*xc)
640	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	758	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
641		759
642	x += r->TermWin.fwidth;	760	x += r->TermWin.fwidth;
643	xc++; len--;	761	xc++; len--;
644	}	762	}
645	while (len);	763	while (len);
646	}	764	}
647	else	765	else
648	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	766	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
649	}	767	}
650	}	768	}
651	}	769	}
652		770
653	/////////////////////////////////////////////////////////////////////////////	771	/////////////////////////////////////////////////////////////////////////////
…		…
658	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	776	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
659	#define SWATHBITS 8	777	#define SWATHBITS 8
660	#endif	778	#endif
661		779
662	struct rxvt_font_xft : rxvt_font {	780	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; }	781	rxvt_font_xft () { f = 0; }
690		782
691	void clear ();	783	void clear ();
692		784
693	rxvt_fontprop properties ();	785	rxvt_fontprop properties ();
694		786
695	bool load (const rxvt_fontprop &prop);	787	bool load (const rxvt_fontprop &prop);
696		788
697	void draw (int x, int y,	789	void draw (rxvt_drawable &d, int x, int y,
698	const text_t *text, int len,	790	const text_t *text, int len,
699	int fg, int bg);	791	int fg, int bg);
700		792
701	bool has_codepoint (uint32_t unicode);	793	bool has_codepoint (uint32_t unicode);
702		794
703	protected:	795	protected:
704	XftFont *f;	796	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	};	797	};
715		798
716	void	799	void
717	rxvt_font_xft::clear ()	800	rxvt_font_xft::clear ()
718	{	801	{
719	if (f)	802	if (f)
720	{	803	{
721	XftFontClose (DISPLAY, f);	804	XftFontClose (DISPLAY, f);
722	f = 0;	805	f = 0;
723	}	806	}
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	}	807	}
736		808
737	rxvt_fontprop	809	rxvt_fontprop
738	rxvt_font_xft::properties ()	810	rxvt_font_xft::properties ()
739	{	811	{
740	rxvt_fontprop p;	812	rxvt_fontprop p;
741		813
742	FT_Face face = XftLockFace (f);	814	FT_Face face = XftLockFace (f);
743		815
744	p.height = height;	816	p.width = width; p.height = height;
745	p.weight = face->style_flags & FT_STYLE_FLAG_BOLD ? rxvt_fontprop::bold : rxvt_fontprop::medium;	817	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;	818	p.slant = face->style_flags & FT_STYLE_FLAG_ITALIC ? rxvt_fontprop::italic : rxvt_fontprop::roman;
747		819
748	XftUnlockFace (f);	820	XftUnlockFace (f);
749		821
…		…
771	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);	843	FcPatternAddInteger (p, FC_WEIGHT, prop.weight);
772		844
773	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)	845	if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
774	FcPatternAddInteger (p, FC_SLANT, prop.slant);	846	FcPatternAddInteger (p, FC_SLANT, prop.slant);
775		847
		848	#if 0 // clipping unfortunately destroys our precious double-width-characters
		849	// clip width, we can't do better, or can we?
		850	if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
		851	FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
		852	#endif
		853
776	//FcPatternAddBool (p, FC_MINSPACE, 1);	854	//FcPatternAddBool (p, FC_MINSPACE, 1);
777		855
778	XftResult result;	856	XftResult result;
779	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);	857	FcPattern *match = XftFontMatch (DISPLAY, DefaultScreen (DISPLAY), p, &result);
780		858
…		…
832	XftUnlockFace (f);	910	XftUnlockFace (f);
833		911
834	return true;	912	return true;
835	}	913	}
836		914
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	915	bool
850	rxvt_font_xft::has_codepoint (uint32_t unicode)	916	rxvt_font_xft::has_codepoint (uint32_t unicode)
851	{	917	{
852	return XftCharExists (DISPLAY, f, unicode);	918	return XftCharExists (DISPLAY, f, unicode);
853	}	919	}
854		920
855	void	921	void
856	rxvt_font_xft::draw (int x, int y,	922	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
857	const text_t *text, int len,	923	const text_t *text, int len,
858	int fg, int bg)	924	int fg, int bg)
859	{	925	{
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);	926	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
870		927
871	if (!slow && width == r->TermWin.fwidth)	928	if (!slow && width == r->TermWin.fwidth && 0)
872	{	929	{
873	if (sizeof (text_t) == sizeof (FcChar16))	930	if (sizeof (text_t) == sizeof (FcChar16))
874	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);
875	else	932	else
876	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);
…		…
879	{	936	{
880	while (len)	937	while (len)
881	{	938	{
882	if (text != NOCHAR && text != ' ')	939	if (text != NOCHAR && text != ' ')
883	{	940	{
		941	int fwidth = r->TermWin.fwidth;
		942	if (len >= 2 && text[1] == NOCHAR)
		943	fwidth *= 2;
		944
		945	XGlyphInfo extents;
884	if (sizeof (text_t) == sizeof (FcChar16))	946	if (sizeof (text_t) == sizeof (FcChar16))
885	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	}
886	else	952	else
887	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	}
888	}	959	}
889		960
890	x += r->TermWin.fwidth;	961	x += r->TermWin.fwidth;
891	text++;	962	text++;
892	len--;	963	len--;
…		…
896	#endif	967	#endif
897		968
898	/////////////////////////////////////////////////////////////////////////////	969	/////////////////////////////////////////////////////////////////////////////
899		970
900	rxvt_fontset::rxvt_fontset (rxvt_t r)	971	rxvt_fontset::rxvt_fontset (rxvt_t r)
901	#ifdef EXPLICIT_CONTEXT
902	: r(r)	972	: r (r)
903	#endif
904	{	973	{
905	clear ();	974	clear ();
906	}	975	}
907		976
908	rxvt_fontset::~rxvt_fontset ()	977	rxvt_fontset::~rxvt_fontset ()
…		…
911	}	980	}
912		981
913	void	982	void
914	rxvt_fontset::clear ()	983	rxvt_fontset::clear ()
915	{	984	{
916	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	985	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
917	FONT_UNREF (*i);	986	FONT_UNREF (*i);
918		987
919	fonts.clear ();	988	fonts.clear ();
920	base_id = 0;	989	base_id = 0;
921	base_prop.height = 0x7fffffff;	990	base_prop.height = 0x7fffffff;
…		…
975		1044
976	if (*desc == '[')	1045	if (*desc == '[')
977	{	1046	{
978	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1047	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
979		1048
980	const char *extra = desc++;	1049	//const char *extra = desc++; // not yet used
981		1050
982	desc = strchr (desc, ']');	1051	desc = strchr (desc, ']');
983		1052
984	if (!desc)	1053	if (!desc)
985	{	1054	{
…		…
1024	}	1093	}
1025		1094
1026	return true;	1095	return true;
1027	}	1096	}
1028		1097
1029	void	1098	bool
1030	rxvt_fontset::populate (const char *desc)	1099	rxvt_fontset::populate (const char *desc)
1031	{	1100	{
1032	clear ();	1101	clear ();
1033		1102
1034	fonts.push_back (new_font (0, CS_UNICODE));	1103	fonts.push_back (new_font (0, CS_UNICODE));
…		…
1038		1107
1039	if (!base_id)	1108	if (!base_id)
1040	base_id = 1;	1109	base_id = 1;
1041		1110
1042	// we currently need a base-font, no matter what	1111	// we currently need a base-font, no matter what
1043	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1112	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1044	{	1113	{
		1114	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1045	add_fonts ("fixed");	1115	add_fonts ("fixed");
1046	base_id = fonts.size () - 1;	1116	base_id = fonts.size () - 1;
1047	}	1117	}
1048		1118
1049	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1119	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1050	{	1120	return false;
1051	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1052	exit (1);
1053	}
1054		1121
1055	base_prop = fonts[base_id]->properties ();	1122	base_prop = fonts[base_id]->properties ();
		1123
		1124	return true;
1056	}	1125	}
1057		1126
1058	int	1127	int
1059	rxvt_fontset::find_font (uint32_t unicode)	1128	rxvt_fontset::find_font (uint32_t unicode)
1060	{	1129	{
1061	for (int i = 0; i < fonts.size (); i++)	1130	for (unsigned int i = 0; i < fonts.size (); i++)
1062	{	1131	{
1063	rxvt_font *f = fonts[i];	1132	rxvt_font *f = fonts[i];
1064		1133
1065	if (!f->loaded)	1134	if (!f->loaded)
1066	{	1135	{

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.30 by pcg, Wed Mar 3 23:06:58 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.30 by pcg, Wed Mar 3 23:06:58 2004 UTC