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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.47 by pcg, Tue Mar 16 06:04:28 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 TGC 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;
35	} fallback_fonts[] = {	34	} fallback_fonts[] = {
…		…
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_1990_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_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, TGC, r->PixColors[color]);
172	XFillRectangle (DISPLAY, DRAWABLE, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, TGC, x, y, w, h);
		201	#endif
173	}	202	}
174	}	203	}
175		204
176	static const char *linedraw_cmds[128] = {	205	#include "table/linedraw.h"
177	"1hH", "2hH", "1vV", "2vV",
178	0, 0, 0, 0,
179	0, 0, 0, 0,
180	"1HV", "2H1V", "1H2V", "2HV",
181
182	// 2510
183	"1hV", "2h1V", "1h2V", "2hV",
184	"1Hv", "2H1v", "1H2v", "2Hv",
185	"1hv", "2h1v", "1h2v", "2hv",
186	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
187
188	// 2520
189	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
190	"1hvV", "2h1vV", "1hV2v", "1hv2V",
191	"1h2vV", "2hv1V", "1v2hV", "2hvV",
192	"1hHV", "2h1HV", "2H1hV", "2hH1V",
193
194	// 2530
195	"1hH2V", "2hV1H", "1h2HV", "2hHV",
196	"1hHv", "1vH2h", "1hv2H", "1v2hH",
197	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
198	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
199
200	// 2540
201	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
202	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
203	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
204	0, 0, 0, 0,
205
206	// 2550
207	0, 0, 0, 0,
208	0, 0, 0, 0,
209	0, 0, 0, 0,
210	0, 0, 0, 0,
211
212	// 2560
213	0, 0, 0, 0,
214	0, 0, 0, 0,
215	0, 0, 0, 0,
216	0, 0, 0, 0,
217
218	// 2570
219	0, "1a", "1b", "1ab",
220	"1h", "1v", "1H", "1V",
221	"2h", "2v", "2H", "2V",
222	"1h2H", "1v2V", "1H2h", "1V2v"
223
224	// to be done
225	};
226		206
227	struct rxvt_font_default : rxvt_font {	207	struct rxvt_font_default : rxvt_font {
		208
228	rxvt_fontprop properties ()	209	rxvt_fontprop properties ()
229	{	210	{
230	rxvt_fontprop p;	211	rxvt_fontprop p;
231		212
232	p.width = p.height = 1;	213	p.width = p.height = 1;
…		…
239	bool load (const rxvt_fontprop &prop)	220	bool load (const rxvt_fontprop &prop)
240	{	221	{
241	width = 1; height = 1;	222	width = 1; height = 1;
242	ascent = 1; descent = 0;	223	ascent = 1; descent = 0;
243		224
		225	set_name (strdup ("built-in pseudofont"));
		226
244	return true;	227	return true;
245	}	228	}
246		229
247	bool has_codepoint (uint32_t unicode)	230	bool has_codepoint (unicode_t unicode)
248	{	231	{
249	if (unicode <= 0x001f)	232	if (unicode <= 0x001f)
250	return true;	233	return true;
		234
251	if (unicode >= 0x0080 && unicode <= 0x009f)	235	if (unicode >= 0x0080 && unicode <= 0x009f)
252	return true;	236	return true;
253		237
254	if (unicode >= 0x2500 && unicode <= 0x257f	238	if (unicode >= 0x2500 && unicode <= 0x259f)
255	&& linedraw_cmds[unicode - 0x2500])	239	return true;
		240
		241	if (IS_COMPOSE (unicode))
256	return true;	242	return true;
257		243
258	switch (unicode)	244	switch (unicode)
259	{	245	{
260	case ZERO_WIDTH_CHAR:	246	case ZERO_WIDTH_CHAR:
…		…
262	}	248	}
263		249
264	return false;	250	return false;
265	}	251	}
266		252
267	void draw (int x, int y,	253	void draw (rxvt_drawable &d, int x, int y,
268	const text_t *text, int len,	254	const text_t *text, int len,
269	int fg, int bg);	255	int fg, int bg);
270	};	256	};
271		257
272	void	258	void
273	rxvt_font_default::draw (int x, int y,	259	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
274	const text_t *text, int len,	260	const text_t *text, int len,
275	int fg, int bg)	261	int fg, int bg)
276	{	262	{
277	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	263	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
278		264
279	XSetForeground (DISPLAY, GC, r->PixColors[fg]);	265	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
280		266
281	while (len--)	267	while (len--)
282	{	268	{
		269	#if ENABLE_COMBINING
		270	compose_char *cc;
		271	#endif
283	text_t t = *text++;	272	text_t t = *text++;
284		273
285	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	274	if (0x2500 <= t && t <= 0x259f)
		275	{
		276	uint16_t offs = linedraw_offs[t - 0x2500];
		277	uint32_t *a = linedraw_command + (offs >> 4);
		278	uint32_t *b = a + (offs & 15);
		279
		280	int W = r->TermWin.fwidth;
		281	int H = r->TermWin.fheight;
		282
		283	int x_[16];
		284	int y_[16];
		285
		286	for (int i = 0; i <= 8; i++)
286	{	287	{
287	const char *p = linedraw_cmds[t - 0x2500];	288	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		289	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
		290	}
288		291
289	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth ;	292	x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
290	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight;	293	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
291		294
292	XGCValues gcv;	295	XGCValues gcv;
293		296
		297	gcv.cap_style = CapButt;
		298	gcv.line_width = 0;
		299	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		300
294	while (*p)	301	while (a < b)
295	{	302	{
		303	uint32_t command = *a++;
		304
		305	int op = (command >> 24) & 255;
		306	int a = (command >> 20) & 15;
		307	int b = (command >> 16) & 15;
		308	int x1 = x_[(command >> 12) & 15];
		309	int y1 = y_[(command >> 8) & 15];
		310	int x2 = x_[(command >> 4) & 15];
		311	int y2 = y_[(command >> 0) & 15];
		312
296	switch (*p++)	313	switch (op)
297	{	314	{
298	case '1':	315	case 0: // line
299	gcv.line_width = 0;	316	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
300	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);
301	break;	317	break;
302		318
303	case '2':	319	case 1: // rectangle, possibly stippled
		320	if (a)
		321	{
		322	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
		323
		324	gcv.fill_style = FillStippled;
		325	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		326	gcv.ts_x_origin = x;
		327	gcv.ts_y_origin = y;
		328
		329	XChangeGC (d.display->display, TGC,
		330	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		331	&gcv);
		332	}
		333
		334	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		335
		336	if (a)
		337	{
		338	XFreePixmap (d.display->display, gcv.stipple);
304	gcv.line_width = 2;	339	gcv.stipple = 0;
305	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	340	gcv.fill_style = FillSolid;
		341	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		342	}
306	break;	343	break;
307		344	case 2: // arc
308	case 'h': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y1, x1, y1); break;	345	XDrawArc (d.display->display, d, TGC,
309	case 'H': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x2, y1); break;	346	x1 - W/2, y1 - H/2, W-1, H-1,
310	case 'v': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y0, x1, y1); break;	347	(a - 1) * 9064, (b - 1) 90*64);
311	case 'V': XDrawLine (DISPLAY, DRAWABLE, GC, x1, y1, x1, y2); break;	348	break;
312	case 'a': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y2, x2, y0); break;
313	case 'b': XDrawLine (DISPLAY, DRAWABLE, GC, x0, y0, x2, y2); break;
314	}	349	}
315	}	350	}
316		351	}
317	gcv.line_width = 0;	352	#if ENABLE_COMBINING
318	XChangeGC (DISPLAY, GC, GCLineWidth, &gcv);	353	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
319	}	354	{
		355	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		356	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		357	if (cc->c2 != NOCHAR)
		358	{
		359	// prefer font of first character, for no good reasons
		360	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		361	? f1
		362	: (*fs)[fs->find_font (cc->c2)];
		363
		364	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		365	}
		366	}
		367	#endif
320	else	368	else
321	switch (*text++)	369	switch (t)
322	{	370	{
323	case NOCHAR:
324	case ZERO_WIDTH_CHAR:	371	case ZERO_WIDTH_CHAR:
325	break;	372	break;
		373
326	default:	374	default:
327	XDrawRectangle (DISPLAY, DRAWABLE, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	375	int w = 0;
		376	while (len > 0 && *text == NOCHAR)
		377	{
		378	++text;
		379	--len;
		380	w += r->TermWin.fwidth;
		381	}
		382
		383	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
		384	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
		385	x += w;
328	}	386	}
329		387
330	x += r->TermWin.fwidth;	388	x += r->TermWin.fwidth;
331	}	389	}
332	}	390	}
…		…
340		398
341	rxvt_fontprop properties ();	399	rxvt_fontprop properties ();
342		400
343	bool load (const rxvt_fontprop &prop);	401	bool load (const rxvt_fontprop &prop);
344		402
345	bool has_codepoint (uint32_t unicode);	403	bool has_codepoint (unicode_t unicode);
346		404
347	void draw (int x, int y,	405	void draw (rxvt_drawable &d, int x, int y,
348	const text_t *text, int len,	406	const text_t *text, int len,
349	int fg, int bg);	407	int fg, int bg);
350		408
351	XFontStruct *f;	409	XFontStruct *f;
352	codeset cs;	410	codeset cs;
…		…
407		465
408	bool	466	bool
409	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	467	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
410	{	468	{
411	int slashes = 0;	469	int slashes = 0;
412	const char *comp[12];	470	const char *comp[13];
413		471
414	for (const char c = name; c; c++)	472	for (const char c = name; c; c++)
415	if (*c == '-')	473	if (*c == '-')
416	{	474	{
417	comp[slashes++] = c + 1;	475	comp[slashes++] = c + 1;
…		…
427		485
428	XFontStruct *f = XLoadQueryFont (DISPLAY, name);	486	XFontStruct *f = XLoadQueryFont (DISPLAY, name);
429		487
430	if (f)	488	if (f)
431	{	489	{
432	// the font should really exists now. if not, we have a problem	490	// the font should really exist now. if not, we have a problem
433	// (e.g. if the user did xset fp rehash just when we were searching fonts).	491	// (e.g. if the user did xset fp rehash just when we were searching fonts).
434	// in that case, just return garbage.	492	// in that case, just return garbage.
435	bool ret = set_properties (p, f);	493	bool ret = set_properties (p, f);
436	XFreeFont (DISPLAY, f);	494	XFreeFont (DISPLAY, f);
437	return ret;	495	return ret;
…		…
514	f = XLoadQueryFont (DISPLAY, name);	572	f = XLoadQueryFont (DISPLAY, name);
515		573
516	if (!f)	574	if (!f)
517	return false;	575	return false;
518		576
519	unsigned long value;
520
521	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);	577	const char *registry = get_property (f, "CHARSET_REGISTRY", 0);
522	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);	578	const char *encoding = get_property (f, "CHARSET_ENCODING", 0);
523		579
524	if (registry && encoding)	580	if (registry && encoding)
525	{	581	{
…		…
599	f = 0;	655	f = 0;
600	}	656	}
601	}	657	}
602		658
603	bool	659	bool
604	rxvt_font_x11::has_codepoint (uint32_t unicode)	660	rxvt_font_x11::has_codepoint (unicode_t unicode)
605	{	661	{
606	uint32_t ch = FROM_UNICODE (cs, unicode);	662	uint32_t ch = FROM_UNICODE (cs, unicode);
607		663
608	if (ch == NOCHAR)	664	if (ch == NOCHAR)
609	return false;	665	return false;
…		…
611	/* check wether the character exists in _this_ font. horrible. */	667	/* check wether the character exists in _this_ font. horrible. */
612	XCharStruct *xcs;	668	XCharStruct *xcs;
613		669
614	if (encm)	670	if (encm)
615	{	671	{
616	int byte1 = ch >> 8;	672	unsigned char byte1 = ch >> 8;
617	int byte2 = ch & 255;	673	unsigned char byte2 = ch & 255;
618		674
619	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1	675	if (byte1 < f->min_byte1 \|\| byte1 > f->max_byte1
620	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)	676	\|\| byte2 < f->min_char_or_byte2 \|\| byte2 > f->max_char_or_byte2)
621	return false;	677	return false;
622		678
…		…
645		701
646	return true;	702	return true;
647	}	703	}
648		704
649	void	705	void
650	rxvt_font_x11::draw (int x, int y,	706	rxvt_font_x11::draw (rxvt_drawable &d, int x, int y,
651	const text_t *text, int len,	707	const text_t *text, int len,
652	int fg, int bg)	708	int fg, int bg)
653	{	709	{
654	// this looks like a mess /.	710	// this looks like a mess /.
655	// and it is a mess /.	711	// and it is a mess /.
…		…
671	{	727	{
672	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	728	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
673		729
674	if (bg == Color_bg && !slow)	730	if (bg == Color_bg && !slow)
675	{	731	{
676	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	732	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
677	XDrawImageString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	733	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
678	}	734	}
679	else	735	else
680	{	736	{
681	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	737	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
682		738
683	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	739	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
684		740
685	if (slow)	741	if (slow)
686	{	742	{
687	do	743	do
688	{	744	{
689	if (xc->byte1 \|\| xc->byte2)	745	if (xc->byte1 \|\| xc->byte2)
690	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	746	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
691		747
692	x += r->TermWin.fwidth;	748	x += r->TermWin.fwidth;
693	xc++; len--;	749	xc++; len--;
694	}	750	}
695	while (len);	751	while (len);
696	}	752	}
697	else	753	else
698	XDrawString16 (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	754	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
699	}	755	}
700	}	756	}
701	else	757	else
702	{	758	{
703	const char *xc = enc_char (text, len, cs, slow);	759	const char *xc = enc_char (text, len, cs, slow);
704		760
705	if (bg == Color_bg && !slow)	761	if (bg == Color_bg && !slow)
706	{	762	{
707	XChangeGC (DISPLAY, GC, GCForeground \| GCBackground \| GCFont, &v);	763	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
708	XDrawImageString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	764	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
709	}	765	}
710	else	766	else
711	{	767	{
712	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	768	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713		769
714	XChangeGC (DISPLAY, GC, GCForeground \| GCFont, &v);	770	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
715		771
716	if (slow)	772	if (slow)
717	{	773	{
718	do	774	do
719	{	775	{
720	if (*xc)	776	if (*xc)
721	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, 1);	777	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
722		778
723	x += r->TermWin.fwidth;	779	x += r->TermWin.fwidth;
724	xc++; len--;	780	xc++; len--;
725	}	781	}
726	while (len);	782	while (len);
727	}	783	}
728	else	784	else
729	XDrawString (DISPLAY, DRAWABLE, GC, x, y + base, xc, len);	785	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
730	}	786	}
731	}	787	}
732	}	788	}
733		789
734	/////////////////////////////////////////////////////////////////////////////	790	/////////////////////////////////////////////////////////////////////////////
…		…
739	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables	795	//#define SWATHBITS (UNIBITS / 2 + 3) // minimum size for "full" tables
740	#define SWATHBITS 8	796	#define SWATHBITS 8
741	#endif	797	#endif
742		798
743	struct rxvt_font_xft : rxvt_font {	799	struct rxvt_font_xft : rxvt_font {
744	rxvt_font_xft () { f = 0; d = 0; }	800	rxvt_font_xft () { f = 0; }
745		801
746	void clear ();	802	void clear ();
747		803
748	rxvt_fontprop properties ();	804	rxvt_fontprop properties ();
749		805
750	bool load (const rxvt_fontprop &prop);	806	bool load (const rxvt_fontprop &prop);
751		807
752	void draw (int x, int y,	808	void draw (rxvt_drawable &d, int x, int y,
753	const text_t *text, int len,	809	const text_t *text, int len,
754	int fg, int bg);	810	int fg, int bg);
755		811
756	bool has_codepoint (uint32_t unicode);	812	bool has_codepoint (unicode_t unicode);
757		813
758	protected:	814	protected:
759	XftFont *f;	815	XftFont *f;
760	XftDraw *d;
761	};	816	};
762		817
763	void	818	void
764	rxvt_font_xft::clear ()	819	rxvt_font_xft::clear ()
765	{	820	{
766	if (f)	821	if (f)
767	{	822	{
768	XftFontClose (DISPLAY, f);	823	XftFontClose (DISPLAY, f);
769	f = 0;	824	f = 0;
770	}
771
772	if (d)
773	{
774	XftDrawDestroy (d);
775	d = 0;
776	}	825	}
777	}	826	}
778		827
779	rxvt_fontprop	828	rxvt_fontprop
780	rxvt_font_xft::properties ()	829	rxvt_font_xft::properties ()
…		…
881		930
882	return true;	931	return true;
883	}	932	}
884		933
885	bool	934	bool
886	rxvt_font_xft::has_codepoint (uint32_t unicode)	935	rxvt_font_xft::has_codepoint (unicode_t unicode)
887	{	936	{
888	return XftCharExists (DISPLAY, f, unicode);	937	return XftCharExists (DISPLAY, f, unicode);
889	}	938	}
890		939
891	void	940	void
892	rxvt_font_xft::draw (int x, int y,	941	rxvt_font_xft::draw (rxvt_drawable &d, int x, int y,
893	const text_t *text, int len,	942	const text_t *text, int len,
894	int fg, int bg)	943	int fg, int bg)
895	{	944	{
896	if (!d)
897	{
898	dR;
899	d = XftDrawCreate (DISPLAY, DRAWABLE, XVISUAL, XCMAP);
900	}
901
902	if (bg >= 0 && bg != Color_bg)
903	XftDrawRect (d, &r->PixColors[bg].c, x, y, r->TermWin.fwidth * len, r->TermWin.fheight);
904	else
905	clear_rect (x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	945	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
906		946
907	if (!slow && width == r->TermWin.fwidth && 0)	947	if (!slow && width == r->TermWin.fwidth && 0)
908	{	948	{
909	if (sizeof (text_t) == sizeof (FcChar16))	949	if (sizeof (text_t) == sizeof (FcChar16))
910	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);	950	XftDrawString16 (d, &r->PixColors[fg].c, f, x, y + r->TermWin.fbase, (const FcChar16 *)text, len);
…		…
915	{	955	{
916	while (len)	956	while (len)
917	{	957	{
918	if (text != NOCHAR && text != ' ')	958	if (text != NOCHAR && text != ' ')
919	{	959	{
		960	int fwidth = r->TermWin.fwidth;
		961	if (len >= 2 && text[1] == NOCHAR)
		962	fwidth *= 2;
		963
920	XGlyphInfo extents;	964	XGlyphInfo extents;
921	if (sizeof (text_t) == sizeof (FcChar16))	965	if (sizeof (text_t) == sizeof (FcChar16))
922	{	966	{
923	XftTextExtents16 (DISPLAY, f, (const FcChar16 *)text, 1, &extents);	967	XftTextExtents16 (d.display->display, f, (const FcChar16 *)text, 1, &extents);
924	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2,	968	XftDrawString16 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
925	y + r->TermWin.fbase, (const FcChar16 *)text, 1);	969	y + r->TermWin.fbase, (const FcChar16 *)text, 1);
926	}	970	}
927	else	971	else
928	{	972	{
929	XGlyphInfo extents;	973	XGlyphInfo extents;
930	XftTextExtents32 (DISPLAY, f, (const FcChar32 *)text, 1, &extents);	974	XftTextExtents32 (d.display->display, f, (const FcChar32 *)text, 1, &extents);
931	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (r->TermWin.fwidth - extents.width) / 2,	975	XftDrawString32 (d, &r->PixColors[fg].c, f, x + extents.x + (fwidth - extents.width) / 2,
932	y + r->TermWin.fbase, (const FcChar32 *)text, 1);	976	y + r->TermWin.fbase, (const FcChar32 *)text, 1);
933	}	977	}
934	}	978	}
935		979
936	x += r->TermWin.fwidth;	980	x += r->TermWin.fwidth;
…		…
942	#endif	986	#endif
943		987
944	/////////////////////////////////////////////////////////////////////////////	988	/////////////////////////////////////////////////////////////////////////////
945		989
946	rxvt_fontset::rxvt_fontset (rxvt_t r)	990	rxvt_fontset::rxvt_fontset (rxvt_t r)
947	#ifdef EXPLICIT_CONTEXT
948	: r(r)	991	: r (r)
949	#endif
950	{	992	{
951	clear ();	993	clear ();
952	}	994	}
953		995
954	rxvt_fontset::~rxvt_fontset ()	996	rxvt_fontset::~rxvt_fontset ()
…		…
957	}	999	}
958		1000
959	void	1001	void
960	rxvt_fontset::clear ()	1002	rxvt_fontset::clear ()
961	{	1003	{
962	for (rxvt_font **i = fonts.begin (); i != fonts.end(); i++)	1004	for (rxvt_font **i = fonts.begin (); i != fonts.end (); i++)
963	FONT_UNREF (*i);	1005	FONT_UNREF (*i);
964		1006
965	fonts.clear ();	1007	fonts.clear ();
966	base_id = 0;	1008	base_id = 0;
967	base_prop.height = 0x7fffffff;	1009	base_prop.height = 0x7fffffff;
…		…
994	f = new rxvt_font_x11;	1036	f = new rxvt_font_x11;
995	}	1037	}
996	else	1038	else
997	f = new rxvt_font_x11;	1039	f = new rxvt_font_x11;
998		1040
		1041	f->fs = this;
999	f->set_term (r);	1042	f->set_term (r);
1000	f->set_name (strdup (name));	1043	f->set_name (strdup (name));
1001		1044
1002	f->cs = cs;	1045	f->cs = cs;
1003	f->loaded = false;	1046	f->loaded = false;
…		…
1021		1064
1022	if (*desc == '[')	1065	if (*desc == '[')
1023	{	1066	{
1024	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");	1067	fprintf (stderr, "extra font parameters not yet supported, skipping.\n");
1025		1068
1026	const char *extra = desc++;	1069	//const char *extra = desc++; // not yet used
1027		1070
1028	desc = strchr (desc, ']');	1071	desc = strchr (desc, ']');
1029		1072
1030	if (!desc)	1073	if (!desc)
1031	{	1074	{
…		…
1070	}	1113	}
1071		1114
1072	return true;	1115	return true;
1073	}	1116	}
1074		1117
1075	void	1118	bool
1076	rxvt_fontset::populate (const char *desc)	1119	rxvt_fontset::populate (const char *desc)
1077	{	1120	{
1078	clear ();	1121	clear ();
1079		1122
1080	fonts.push_back (new_font (0, CS_UNICODE));	1123	fonts.push_back (new_font (0, CS_UNICODE));
…		…
1084		1127
1085	if (!base_id)	1128	if (!base_id)
1086	base_id = 1;	1129	base_id = 1;
1087		1130
1088	// we currently need a base-font, no matter what	1131	// we currently need a base-font, no matter what
1089	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1132	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1090	{	1133	{
		1134	puts ("unable to load specified font (s), falling back to 'fixed'\n");
1091	add_fonts ("fixed");	1135	add_fonts ("fixed");
1092	base_id = fonts.size () - 1;	1136	base_id = fonts.size () - 1;
1093	}	1137	}
1094		1138
1095	if (fonts.size () <= base_id \|\| !realize_font (base_id))	1139	if ((int)fonts.size () <= base_id \|\| !realize_font (base_id))
1096	{	1140	return false;
1097	fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1098	exit (1);
1099	}
1100		1141
1101	base_prop = fonts[base_id]->properties ();	1142	base_prop = fonts[base_id]->properties ();
		1143
		1144	return true;
1102	}	1145	}
1103		1146
1104	int	1147	int
1105	rxvt_fontset::find_font (uint32_t unicode)	1148	rxvt_fontset::find_font (unicode_t unicode)
1106	{	1149	{
1107	for (int i = 0; i < fonts.size (); i++)	1150	for (unsigned int i = 0; i < fonts.size (); i++)
1108	{	1151	{
1109	rxvt_font *f = fonts[i];	1152	rxvt_font *f = fonts[i];
1110		1153
1111	if (!f->loaded)	1154	if (!f->loaded)
1112	{	1155	{

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs. Revision 1.47 by pcg, Tue Mar 16 06:04:28 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.12 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.47 by pcg, Tue Mar 16 06:04:28 2004 UTC