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

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

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs. Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.7 by pcg, Thu Dec 18 04:14:30 2003 UTC vs.
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC