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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.11 by pcg, Wed Dec 24 09:40:30 2003 UTC vs.
Revision 1.35 by pcg, Thu Mar 4 20:09:01 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",
…		…
246		275
247	bool has_codepoint (uint32_t unicode)	276	bool has_codepoint (uint32_t unicode)
248	{	277	{
249	if (unicode <= 0x001f)	278	if (unicode <= 0x001f)
250	return true;	279	return true;
		280
251	if (unicode >= 0x0080 && unicode <= 0x009f)	281	if (unicode >= 0x0080 && unicode <= 0x009f)
252	return true;	282	return true;
253		283
254	if (unicode >= 0x2500 && unicode <= 0x257f	284	if (unicode >= 0x2500 && unicode <= 0x257f
255	&& linedraw_cmds[unicode - 0x2500])	285	&& linedraw_cmds[unicode - 0x2500])
		286	return true;
		287
		288	if (IS_COMPOSE (unicode))
256	return true;	289	return true;
257		290
258	switch (unicode)	291	switch (unicode)
259	{	292	{
260	case ZERO_WIDTH_CHAR:	293	case ZERO_WIDTH_CHAR:
…		…
262	}	295	}
263		296
264	return false;	297	return false;
265	}	298	}
266		299
267	void draw (int x, int y,	300	void draw (rxvt_drawable &d, int x, int y,
268	const text_t *text, int len,	301	const text_t *text, int len,
269	int fg, int bg);	302	int fg, int bg);
270	};	303	};
271		304
272	void	305	void
273	rxvt_font_default::draw (int x, int y,	306	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274	const text_t *text, int len,	307	const text_t *text, int len,
275	int fg, int bg)	308	int fg, int bg)
276	{	309	{
277	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	310	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278		311
279	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	312	XSetForeground (d.display->display, GC, r->PixColors[fg]);
280		313
281	while (len--)	314	while (len--)
282	{	315	{
283	text_t t = *text++;	316	text_t t = *text++;
284		317
		318	// is it in our linedrawing table?
285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	319	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
286	{	320	{
287	const char *p = linedraw_cmds[t - 0x2500];	321	const char *p = linedraw_cmds[t - 0x2500];
288		322
289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	323	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
290	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	324	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
291		325
292	XGCValues gcv;	326	XGCValues gcv;
293		327
294	while (*p)	328	while (*p)
295	{	329	{
296	switch (*p++)	330	switch (*p++)
297	{	331	{
298	case '1':	332	case '1':
299	gcv.line_width = 0;	333	gcv.line_width = 0;
300	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	334	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
301	break;	335	break;
302		336
303	case '2':	337	case '2':
304	gcv.line_width = 2;	338	gcv.line_width = 2;
305	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	339	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
306	break;	340	break;
307		341
308	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	342	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;	343	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;	344	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;	345	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;	346	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;	347	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
314	}	348	}
315	}	349	}
316		350
317	gcv.line_width = 0;	351	gcv.line_width = 0;
318	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	352	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
		353	}
		354	else if (IS_COMPOSE (t))
		355	{
		356	const compose_char &cc = rxvt_composite[t];
		357	(void)0; //D ADD pseudo handling here
319	}	358	}
320	else	359	else
321	switch (*text++)	360	switch (t)
322	{	361	{
323	case NOCHAR:
324	case ZERO_WIDTH_CHAR:	362	case ZERO_WIDTH_CHAR:
325	break;	363	break;
326	default:	364	default:
327	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	365	int w = 0;
		366	while (len > 0 && *text == NOCHAR)
		367	{
		368	++text;
		369	--len;
		370	w += r->TermWin.fwidth;
		371	}
		372
		373	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,
		374	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);
		375	x += w;
328	}	376	}
329		377
330	x += r->TermWin.fwidth;	378	x += r->TermWin.fwidth;
331	}	379	}
332	}	380	}
…		…
337	rxvt_font_x11 () { f = 0; }	385	rxvt_font_x11 () { f = 0; }
338		386
339	void clear ();	387	void clear ();
340		388
341	rxvt_fontprop properties ();	389	rxvt_fontprop properties ();
342	rxvt_fontprop properties (XFontStruct *f);
343		390
344	bool load (const rxvt_fontprop &prop);	391	bool load (const rxvt_fontprop &prop);
345		392
346	bool has_codepoint (uint32_t unicode);	393	bool has_codepoint (uint32_t unicode);
347		394
348	void draw (int x, int y,	395	void draw (rxvt_drawable &d, int x, int y,
349	const text_t *text, int len,	396	const text_t *text, int len,
350	int fg, int bg);	397	int fg, int bg);
351		398
352	XFontStruct *f;	399	XFontStruct *f;
353	codeset cs;	400	codeset cs;
354	bool enc2b, encm;	401	bool enc2b, encm;
355		402
356	const char get_property (XFontStruct f, const char property, const char repl) const;	403	const char get_property (XFontStruct f, const char property, const char repl) const;
		404	bool set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth);
		405	bool set_properties (rxvt_fontprop &p, XFontStruct *f);
		406	bool set_properties (rxvt_fontprop &p, const char *name);
357	};	407	};
358		408
359	const char *	409	const char *
360	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const	410	rxvt_font_x11::get_property (XFontStruct f, const char property, const char *repl) const
361	{	411	{
…		…
368	}	418	}
369		419
370	rxvt_fontprop	420	rxvt_fontprop
371	rxvt_font_x11::properties ()	421	rxvt_font_x11::properties ()
372	{	422	{
373	return properties (f);
374	}
375
376	rxvt_fontprop
377	rxvt_font_x11::properties (XFontStruct *f)
378	{
379	rxvt_fontprop p;	423	rxvt_fontprop p;
		424	set_properties (p, f);
		425	return p;
		426	}
380		427
		428	bool
		429	rxvt_font_x11::set_properties (rxvt_fontprop &p, int height, const char weight, const char slant, int avgwidth)
		430	{
		431	p.width = avgwidth ? (avgwidth + 1) / 10 : (height + 1) / 2;
		432	p.height = height;
		433	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
		434	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
		435
		436	return true;
		437	}
		438
		439	bool
		440	rxvt_font_x11::set_properties (rxvt_fontprop &p, XFontStruct *f)
		441	{
381	const char *weight = get_property (f, "WEIGHT_NAME", "medium");	442	const char *weight = get_property (f, "WEIGHT_NAME", "medium");
382	const char *slant = get_property (f, "SLANT", "r");	443	const char *slant = get_property (f, "SLANT", "r");
383		444
		445	unsigned long height;
		446	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "PIXEL_SIZE", 0), &height))
		447	return false;
		448
384	unsigned long avgwidth;	449	unsigned long avgwidth;
385	p.width = XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth)	450	if (!XGetFontProperty (f, XInternAtom (DISPLAY, "AVERAGE_WIDTH", 0), &avgwidth))
386	? avgwidth / 10	451	avgwidth = 0;
387	: (height + 1) / 2;
388	p.height = height;
389	p.weight = weight == 'B' \|\| weight == 'b' ? rxvt_fontprop::bold : rxvt_fontprop::medium;
390	p.slant = slant == 'r' \|\| slant == 'R' ? rxvt_fontprop::roman : rxvt_fontprop::italic;
391		452
392	return p;	453	return set_properties (p, height, weight, slant, avgwidth);
		454	}
		455
		456	bool
		457	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
		458	{
		459	int slashes = 0;
		460	const char *comp[13];
		461
		462	for (const char c = name; c; c++)
		463	if (*c == '-')
		464	{
		465	comp[slashes++] = c + 1;
		466	if (slashes >= 13)
		467	break;
		468	}
		469
		470	/* can we short-circuit the costly XLoadQueryFont? */
		471	if (slashes >= 13
		472	&& (comp[ 6] >= '1' && comp[ 6] <= '9')
		473	&& (comp[11] >= '0' && comp[11] <= '9'))
		474	return set_properties (p, atoi (comp[6]), comp[2], comp[3], atoi (comp[11]));
		475
		476	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
		477
		478	if (f)
		479	{
		480	// the font should really exist now. if not, we have a problem
		481	// (e.g. if the user did xset fp rehash just when we were searching fonts).
		482	// in that case, just return garbage.
		483	bool ret = set_properties (p, f);
		484	XFreeFont (DISPLAY, f);
		485	return ret;
		486	}
		487	else
		488	return false;
		489	}
		490
		491	// fix the size of scalable fonts
		492	static void
		493	fix_scalable (char buf, const char name, const rxvt_fontprop &prop)
		494	{
		495	int slashes = 0;
		496	const char *size;
		497
		498	for (const char c = name; c; c++)
		499	if (*c == '-')
		500	{
		501	if (slashes == 6)
		502	size = c + 1;
		503
		504	if (++slashes >= 13)
		505	break;
		506	}
		507
		508	if (slashes >= 13 && size[0] == '0')
		509	{
		510	strncpy (buf, name, size - name);
		511	buf += size - name;
		512	buf += sprintf (buf, "%d", prop.height);
		513	strcpy (buf, size + 1);
		514	}
		515	else
		516	strcpy (buf, name);
393	}	517	}
394		518
395	bool	519	bool
396	rxvt_font_x11::load (const rxvt_fontprop &prop)	520	rxvt_font_x11::load (const rxvt_fontprop &prop)
397	{	521	{
398	clear ();	522	clear ();
399		523
400	char **list;	524	char **list;
401	int count;	525	int count;
402	XFontStruct *info;
403	list = XListFontsWithInfo (DISPLAY, name, 128, &count, &info);	526	list = XListFonts (DISPLAY, name, 512, &count);
		527	set_name (0);
404		528
405	if (!list)	529	if (!list)
406	return false;	530	return false;
407		531
408	int bestdiff = 0x7fffffff;	532	int bestdiff = 0x7fffffff;
409	XFontStruct *best = 0;
410	for (int i = 0; i < count; i++)	533	for (int i = 0; i < count; i++)
411	{	534	{
412	XFontStruct *f = info + i;	535	rxvt_fontprop p;
		536	char fname[1024];
		537	fix_scalable (fname, list[i], prop);
413		538
		539	if (!set_properties (p, fname))
		540	continue;
		541
414	if (f->ascent + f->descent <= prop.height) // weed out too large fonts	542	if (p.height > prop.height) // weed out too large fonts
415	{	543	continue;
416	rxvt_fontprop p = properties (f);	544
417	int diff = (prop.height - f->ascent + f->descent) * 32	545	int diff = (prop.height - p.height) * 32
418	+ abs (prop.weight - p.weight)	546	+ abs (prop.weight - p.weight)
419	+ abs (prop.slant - p.slant );	547	+ abs (prop.slant - p.slant );
420		548
421	if (!best // compare against best found so far	549	if (!name // compare against best found so far
422	\|\| diff < bestdiff)	550	\|\| diff < bestdiff)
423	{	551	{
424	best = f;	552	set_name (strdup (fname));
425	bestdiff = diff;	553	bestdiff = diff;
426	}	554	}
427	}
428	}	555	}
429		556
		557	XFreeFontNames (list);
		558
430	if (!best)	559	if (!name)
431	return false;	560	return false;
432
433	set_name (strdup (list[best - info]));
434
435	XFreeFontInfo (list, info, count);
436		561
437	f = XLoadQueryFont (DISPLAY, name);	562	f = XLoadQueryFont (DISPLAY, name);
438		563
439	if (!f)	564	if (!f)
440	return false;	565	return false;
441
442	unsigned long value;
443		566
444	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	567	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
445	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	568	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
446		569
447	if (registry && encoding)	570	if (registry && encoding)
…		…
534	/* check wether the character exists in _this_ font. horrible. */	657	/* check wether the character exists in _this_ font. horrible. */
535	XCharStruct *xcs;	658	XCharStruct *xcs;
536		659
537	if (encm)	660	if (encm)
538	{	661	{
539	int byte1 = ch >> 8;	662	unsigned char byte1 = ch >> 8;
540	int byte2 = ch & 255;	663	unsigned char byte2 = ch & 255;
541		664
542	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	665	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
543	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	666	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
544	return false;	667	return false;
545		668
…		…
568		691
569	return true;	692	return true;
570	}	693	}
571		694
572	void	695	void
573	rxvt_font_x11::draw (int x, int y,	696	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
574	const text_t *text, int len,	697	const text_t *text, int len,
575	int fg, int bg)	698	int fg, int bg)
576	{	699	{
577	// this looks like a mess /.	700	// this looks like a mess /.
578	// and it is a mess /.	701	// and it is a mess /.
…		…
594	{	717	{
595	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	718	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
596		719
597	if (bg == Color_bg && !slow)	720	if (bg == Color_bg && !slow)
598	{	721	{
599	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	722	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
600	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	723	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);
601	}	724	}
602	else	725	else
603	{	726	{
604	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	727	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
605		728
606	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	729	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
607		730
608	if (slow)	731	if (slow)
609	{	732	{
610	do	733	do
611	{	734	{
612	if (xc->byte1 \|\| xc->byte2)	735	if (xc->byte1 \|\| xc->byte2)
613	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	736	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);
614		737
615	x += r->TermWin.fwidth;	738	x += r->TermWin.fwidth;
616	xc++; len--;	739	xc++; len--;
617	}	740	}
618	while (len);	741	while (len);
619	}	742	}
620	else	743	else
621	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	744	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);
622	}	745	}
623	}	746	}
624	else	747	else
625	{	748	{
626	const char *xc = enc_char (text, len, cs, slow);	749	const char *xc = enc_char (text, len, cs, slow);
627		750
628	if (bg == Color_bg && !slow)	751	if (bg == Color_bg && !slow)
629	{	752	{
630	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	753	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);
631	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	754	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);
632	}	755	}
633	else	756	else
634	{	757	{
635	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	758	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
636		759
637	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	760	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);
638		761
639	if (slow)	762	if (slow)
640	{	763	{
641	do	764	do
642	{	765	{
643	if (*xc)	766	if (*xc)
644	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	767	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);
645		768
646	x += r->TermWin.fwidth;	769	x += r->TermWin.fwidth;
647	xc++; len--;	770	xc++; len--;
648	}	771	}
649	while (len);	772	while (len);
650	}	773	}
651	else	774	else
652	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	775	XDrawString (d.display->display, d, GC, x, y + base, xc, len);
653	}	776	}
654	}	777	}
655	}	778	}
656		779
657	/////////////////////////////////////////////////////////////////////////////	780	/////////////////////////////////////////////////////////////////////////////
…		…
662	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	785	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
663	#define SWATHBITS 8	786	#define SWATHBITS 8
664	#endif	787	#endif
665		788
666	struct rxvt_font_xft : rxvt_font {	789	struct rxvt_font_xft : rxvt_font {
667	rxvt_font_xft () { f = 0; d = 0; }	790	rxvt_font_xft () { f = 0; }
668		791
669	void clear ();	792	void clear ();
670		793
671	rxvt_fontprop properties ();	794	rxvt_fontprop properties ();
672		795
673	bool load (const rxvt_fontprop &prop);	796	bool load (const rxvt_fontprop &prop);
674		797
675	void draw (int x, int y,	798	void draw (rxvt_drawable &d, int x, int y,
676	const text_t *text, int len,	799	const text_t *text, int len,
677	int fg, int bg);	800	int fg, int bg);
678		801
679	bool has_codepoint (uint32_t unicode);	802	bool has_codepoint (uint32_t unicode);
680		803
681	protected:	804	protected:
682	XftFont *f;	805	XftFont *f;
683	XftDraw *d;
684	};	806	};
685		807
686	void	808	void
687	rxvt_font_xft::clear ()	809	rxvt_font_xft::clear ()
688	{	810	{
689	if (f)	811	if (f)
690	{	812	{
691	XftFontClose (DISPLAY, f);	813	XftFontClose (DISPLAY, f);
692	f = 0;	814	f = 0;
693	}
694
695	if (d)
696	{
697	XftDrawDestroy (d);
698	d = 0;
699	}	815	}
700	}	816	}
701		817
702	rxvt_fontprop	818	rxvt_fontprop
703	rxvt_font_xft::properties ()	819	rxvt_font_xft::properties ()
…		…
810	{	926	{
811	return XftCharExists (DISPLAY, f, unicode);	927	return XftCharExists (DISPLAY, f, unicode);
812	}	928	}
813		929
814	void	930	void
815	rxvt_font_xft::draw (int x, int y,	931	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
816	const text_t *text, int len,	932	const text_t *text, int len,
817	int fg, int bg)	933	int fg, int bg)
818	{	934	{
819	if (!d)
820	{
821	dR;
822	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
823	}
824
825	if (bg >= 0 && bg != Color_bg)
826	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
827	else
828	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	935	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
829		936
830	if (!slow && width == r->TermWin.fwidth)	937	if (!slow && width == r->TermWin.fwidth && 0)
831	{	938	{
832	if (sizeof (text_t) == sizeof (FcChar16))	939	if (sizeof (text_t) == sizeof (FcChar16))
833	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	940	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
834	else	941	else
835	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);	942	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, len);
…		…
838	{	945	{
839	while (len)	946	while (len)
840	{	947	{
841	if (text != NOCHAR && text != ' ')	948	if (text != NOCHAR && text != ' ')
842	{	949	{
		950	int fwidth = r->TermWin.fwidth;
		951	if (len >= 2 && text[1] == NOCHAR)
		952	fwidth *= 2;
		953
		954	XGlyphInfo extents;
843	if (sizeof (text_t) == sizeof (FcChar16))	955	if (sizeof (text_t) == sizeof (FcChar16))
844	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, 1);	956	{
		957	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
		958	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		959	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
		960	}
845	else	961	else
846	XftDrawString32 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar32 *)text, 1);	962	{
		963	XGlyphInfo extents;
		964	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
		965	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
		966	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
		967	}
847	}	968	}
848		969
849	x += r->TermWin.fwidth;	970	x += r->TermWin.fwidth;
850	text++;	971	text++;
851	len--;	972	len--;
…		…
855	#endif	976	#endif
856		977
857	/////////////////////////////////////////////////////////////////////////////	978	/////////////////////////////////////////////////////////////////////////////
858		979
859	rxvt_fontset::rxvt_fontset (rxvt_t r)	980	rxvt_fontset::rxvt_fontset (rxvt_t r)
860	#ifdef EXPLICIT_CONTEXT
861	: r(r)	981	: r (r)
862	#endif
863	{	982	{
864	clear ();	983	clear ();
865	}	984	}
866		985
867	rxvt_fontset::~rxvt_fontset ()	986	rxvt_fontset::~rxvt_fontset ()
…		…
870	}	989	}
871		990
872	void	991	void
873	rxvt_fontset::clear ()	992	rxvt_fontset::clear ()
874	{	993	{
875	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	994	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
876	FONT_UNREF (*i);	995	FONT_UNREF (*i);
877		996
878	fonts.clear ();	997	fonts.clear ();
879	base_id = 0;	998	base_id = 0;
880	base_prop.height = 0x7fffffff;	999	base_prop.height = 0x7fffffff;
…		…
934		1053
935	if (*desc == '[')	1054	if (*desc == '[')
936	{	1055	{
937	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1056	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
938		1057
939	const char *extra = desc++;	1058	//const char *extra = desc++; // not yet used
940		1059
941	desc = strchr (desc, ']');	1060	desc = strchr (desc, ']');
942		1061
943	if (!desc)	1062	if (!desc)
944	{	1063	{
…		…
983	}	1102	}
984		1103
985	return true;	1104	return true;
986	}	1105	}
987		1106
988	void	1107	bool
989	rxvt_fontset::populate (const char *desc)	1108	rxvt_fontset::populate (const char *desc)
990	{	1109	{
991	clear ();	1110	clear ();
992		1111
993	fonts.push_back (new_font (0, CS_UNICODE));	1112	fonts.push_back (new_font (0, CS_UNICODE));
…		…
997		1116
998	if (!base_id)	1117	if (!base_id)
999	base_id = 1;	1118	base_id = 1;
1000		1119
1001	// we currently need a base-font, no matter what	1120	// we currently need a base-font, no matter what
1002	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1121	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1003	{	1122	{
		1123	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1004	add_fonts ("fixed");	1124	add_fonts ("fixed");
1005	base_id = fonts.size () - 1;	1125	base_id = fonts.size () - 1;
1006	}	1126	}
1007		1127
1008	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1128	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1009	{	1129	return false;
1010	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1011	exit (1);
1012	}
1013		1130
1014	base_prop = fonts[base_id]->properties ();	1131	base_prop = fonts[base_id]->properties ();
		1132
		1133	return true;
1015	}	1134	}
1016		1135
1017	int	1136	int
1018	rxvt_fontset::find_font (uint32_t unicode)	1137	rxvt_fontset::find_font (uint32_t unicode)
1019	{	1138	{
1020	for (int i = 0; i < fonts.size (); i++)	1139	for (unsigned int i = 0; i < fonts.size (); i++)
1021	{	1140	{
1022	rxvt_font *f = fonts[i];	1141	rxvt_font *f = fonts[i];
1023		1142
1024	if (!f->loaded)	1143	if (!f->loaded)
1025	{	1144	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.11 by pcg, Wed Dec 24 09:40:30 2003 UTC vs. Revision 1.35 by pcg, Thu Mar 4 20:09:01 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.11 by pcg, Wed Dec 24 09:40:30 2003 UTC vs.
Revision 1.35 by pcg, Thu Mar 4 20:09:01 2004 UTC