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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC vs.
Revision 1.44 by pcg, Tue Mar 16 04:52:20 2004 UTC

…		…
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->display->display	28	#define DISPLAY r->display->display
29	#define GC r->TermWin.gc	29	#define TGC r->TermWin.gc
30		30
31	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
32	codeset cs;	32	codeset cs;
33	const char *name;	33	const char *name;
34	} fallback_fonts[] = {	34	} fallback_fonts[] = {
…		…
61	# if XFT	61	# if XFT
62	// prefer xft for complex scripts	62	// prefer xft for complex scripts
63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
64	# endif	64	# endif
65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
66	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	66	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
68	#endif	68	#endif
69		69
70	#if ENCODING_CN \|\| ENCODING_CN_EXT	70	#if ENCODING_CN \|\| ENCODING_CN_EXT
71	# if XFT	71	# if XFT
72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
76	# endif	76	# endif
		77	{ CS_BIG5, "-----------c-*-big5-0" },
		78	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
		79	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
77	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },	80	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
78	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },	81	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
79	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },	82	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
80	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },	83	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
81	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },	84	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
82	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },	85	{ CS_CNS11643_1992_5, "-----------c--cns11643-5" },
83	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },	86	{ CS_CNS11643_1992_6, "-----------c--cns11643-6" },
84	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },	87	{ CS_CNS11643_1992_7, "-----------c--cns11643-7" },
85	{ CS_CNS11643_1992_F, "-----------c--cns11643-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
…		…
187	else if (color >= 0)	194	else if (color >= 0)
188	{	195	{
189	#if XFT	196	#if XFT
190	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);	197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
191	#else	198	#else
192	XSetForeground (d.display->display, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, TGC, r->PixColors[color]);
193	XFillRectangle (d.display->display, d, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, TGC, x, y, w, h);
194	#endif	201	#endif
195	}	202	}
196	}	203	}
197
198	static const char *linedraw_cmds[128] = {
199	"1hH", "2hH", "1vV", "2vV",
200	0, 0, 0, 0,
201	0, 0, 0, 0,
202	"1HV", "2H1V", "1H2V", "2HV",
203
204	// 2510
205	"1hV", "2h1V", "1h2V", "2hV",
206	"1Hv", "2H1v", "1H2v", "2Hv",
207	"1hv", "2h1v", "1h2v", "2hv",
208	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
209
210	// 2520
211	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
212	"1hvV", "2h1vV", "1hV2v", "1hv2V",
213	"1h2vV", "2hv1V", "1v2hV", "2hvV",
214	"1hHV", "2h1HV", "2H1hV", "2hH1V",
215
216	// 2530
217	"1hH2V", "2hV1H", "1h2HV", "2hHV",
218	"1hHv", "1vH2h", "1hv2H", "1v2hH",
219	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
220	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
221
222	// 2540
223	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
224	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
225	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
226	0, 0, 0, 0,
227
228	// 2550
229	0, 0, 0, 0,
230	0, 0, 0, 0,
231	0, 0, 0, 0,
232	0, 0, 0, 0,
233
234	// 2560
235	0, 0, 0, 0,
236	0, 0, 0, 0,
237	0, 0, 0, 0,
238	0, 0, 0, 0,
239
240	// 2570
241	0, "1a", "1b", "1ab",
242	"1h", "1v", "1H", "1V",
243	"2h", "2v", "2H", "2V",
244	"1h2H", "1v2V", "1H2h", "1V2v"
245
246	// to be done
247	};
248		204
249	struct rxvt_font_default : rxvt_font {	205	struct rxvt_font_default : rxvt_font {
250	rxvt_fontprop properties ()	206	rxvt_fontprop properties ()
251	{	207	{
252	rxvt_fontprop p;	208	rxvt_fontprop p;
…		…
261	bool load (const rxvt_fontprop &prop)	217	bool load (const rxvt_fontprop &prop)
262	{	218	{
263	width = 1; height = 1;	219	width = 1; height = 1;
264	ascent = 1; descent = 0;	220	ascent = 1; descent = 0;
265		221
		222	set_name ("built-in pseudofont");
		223
266	return true;	224	return true;
267	}	225	}
268		226
269	bool has_codepoint (uint32_t unicode)	227	bool has_codepoint (unicode_t unicode)
270	{	228	{
271	if (unicode <= 0x001f)	229	if (unicode <= 0x001f)
272	return true;	230	return true;
		231
273	if (unicode >= 0x0080 && unicode <= 0x009f)	232	if (unicode >= 0x0080 && unicode <= 0x009f)
274	return true;	233	return true;
275		234
276	if (unicode >= 0x2500 && unicode <= 0x257f	235	if (unicode >= 0x2500 && unicode <= 0x259f)
277	&& linedraw_cmds[unicode - 0x2500])	236	return true;
		237
		238	if (IS_COMPOSE (unicode))
278	return true;	239	return true;
279		240
280	switch (unicode)	241	switch (unicode)
281	{	242	{
282	case ZERO_WIDTH_CHAR:	243	case ZERO_WIDTH_CHAR:
…		…
289	void draw (rxvt_drawable &d, int x, int y,	250	void draw (rxvt_drawable &d, int x, int y,
290	const text_t *text, int len,	251	const text_t *text, int len,
291	int fg, int bg);	252	int fg, int bg);
292	};	253	};
293		254
		255	static void rect_stipple (Display *display, Drawable d, GC gc, int s1, int s2, int x, int y, int w, int h)
		256	{
		257	XGCValues gcv;
		258	char bm[2] = { s1, s2 };
		259
		260	gcv.fill_style = FillStippled;
		261	gcv.stipple = XCreateBitmapFromData (display, d, bm, 2, 2);
		262	gcv.ts_x_origin = x;
		263	gcv.ts_y_origin = y;
		264
		265	if (!gcv.stipple)
		266	return;
		267
		268	XChangeGC (display, gc, GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin, &gcv);
		269	XFillRectangle (display, d, gc, x, y, w, h);
		270
		271	XFreePixmap (display, gcv.stipple);
		272
		273	gcv.fill_style = FillSolid;
		274	XChangeGC (display, gc, GCFillStyle, &gcv);
		275	}
		276
		277	#include "table/linedraw.h"
		278
294	void	279	void
295	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	280	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
296	const text_t *text, int len,	281	const text_t *text, int len,
297	int fg, int bg)	282	int fg, int bg)
298	{	283	{
299	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	284	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
300		285
301	XSetForeground (d.display->display, GC, r->PixColors[fg]);	286	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
302		287
303	while (len--)	288	while (len--)
304	{	289	{
		290	#if ENABLE_COMBINING
		291	compose_char *cc;
		292	#endif
305	text_t t = *text++;	293	text_t t = *text++;
306		294
307	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	295	int x_[16];
		296	int y_[16];
		297
		298	int W = r->TermWin.fwidth , w = (W - 1) / 2;
		299	int H = r->TermWin.fheight, h = (H - 1) / 2;
		300	int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
		301	int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
		302
		303	for (int i = 0; i <= 8; i++)
		304	{
		305	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		306	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
308	{	307	}
		308
		309	x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
		310	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
		311
309	const char *p = linedraw_cmds[t - 0x2500];	312	int i1 = linedraw_offs[t - 0x2500];
		313	int i2 = linedraw_offs[t - 0x2500 + 1];
310		314
311	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;
312	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;
313
314	XGCValues gcv;	315	XGCValues gcv;
315		316
		317	gcv.cap_style = CapButt;
		318	gcv.line_width = 0;
		319	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		320
		321	if (i1 != i2)
		322	{
316	while (*p)	323	while (i1 < i2)
317	{	324	{
		325	uint32_t command = linedraw_command [i1++];
		326
		327	int op = (command >> 24) & 255;
		328	int a = (command >> 20) & 15;
		329	int b = (command >> 16) & 15;
		330	int x1 = x_[(command >> 12) & 15];
		331	int y1 = y_[(command >> 8) & 15];
		332	int x2 = x_[(command >> 4) & 15];
		333	int y2 = y_[(command >> 0) & 15];
		334
318	switch (*p++)	335	switch (op)
319	{	336	{
320	case '1':	337	case 0: // line
321	gcv.line_width = 0;	338	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
322	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
323	break;	339	break;
324		340
325	case '2':	341	case 1: // rectangle, possibly stippled
326	gcv.line_width = 2;	342	if (a)
		343	{
		344	static char bm[] = { 0,0 , 1,3 , 2,1 , 0,1 };
		345
		346	gcv.fill_style = FillStippled;
		347	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		348	gcv.ts_x_origin = x;
		349	gcv.ts_y_origin = y;
		350
		351	XChangeGC (d.display->display, TGC,
		352	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		353	&gcv);
		354	}
		355
		356
		357	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		358
		359	if (a)
		360	{
		361	XFreePixmap (d.display->display, gcv.stipple);
		362	gcv.fill_style = FillSolid;
327	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	363	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		364	}
		365
328	break;	366	break;
329		367	case 2: // arc
330	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;	368	break;
331	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
332	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
333	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;
334	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
335	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
336	}	369	}
337	}	370	}
338		371
339	gcv.line_width = 0;	372	#if 0
340	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	373	case 'A': XDrawArc (d.display->display, d, TGC, x1 , y1 , W-1, H-1, 9064, 9064); break;
		374	case 'B': XDrawArc (d.display->display, d, TGC, x1-W+1, y1 , W-1, H-1, 064, 9064); break;
		375	case 'C': XDrawArc (d.display->display, d, TGC, x1-W+1, y1-H+1, W-1, H-1, 064, -9064); break;
		376	case 'D': XDrawArc (d.display->display, d, TGC, x1 , y1-H+1, W-1, H-1, -9064, -9064); break;
		377
		378	case 'i': XFillRectangle (d.display->display, d, TGC, x0, y0, x1 - x0 + 1, y1 - y0 + 1); break;
		379	case 'j': XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, y1 - y0 + 1); break;
		380	case 'k': XFillRectangle (d.display->display, d, TGC, x0, y1, x1 - x0 + 1, y2 - y1); break;
		381	case 'l': XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1, y2 - y1); break;
		382	}
		383	}
		384	#endif
		385
		386	}
		387	#if ENABLE_COMBINING
		388	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
341	}	389	{
		390	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		391	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		392	if (cc->c2 != NOCHAR)
		393	{
		394	// prefer font of first character, for no good reasons
		395	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		396	? f1
		397	: (*fs)[fs->find_font (cc->c2)];
		398
		399	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		400	}
		401	}
		402	#endif
342	else	403	else
343	switch (*text++)	404	switch (t)
344	{	405	{
345	case NOCHAR:
346	case ZERO_WIDTH_CHAR:	406	case ZERO_WIDTH_CHAR:
347	break;	407	break;
		408
		409	#if 0
		410	case 0x2580: XFillRectangle (d.display->display, d, TGC, x0, y0, W, y1 - y0 + 1); break;
		411	case 0x2581: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 7 - 1) / 8, W, H - (H * 7 - 1) / 8); break;
		412	case 0x2582: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 6 - 2) / 8, W, H - (H * 6 - 2) / 8); break;
		413	case 0x2583: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 5 - 3) / 8, W, H - (H * 5 - 3) / 8); break;
		414	case 0x2584: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 4 - 4) / 8, W, H - (H * 4 - 4) / 8); break;
		415	case 0x2585: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 3 - 5) / 8, W, H - (H * 3 - 5) / 8); break;
		416	case 0x2586: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 2 - 6) / 8, W, H - (H * 2 - 6) / 8); break;
		417	case 0x2587: XFillRectangle (d.display->display, d, TGC, x0, y0 + (H * 1 - 7) / 8, W, H - (H * 1 - 7) / 8); break;
		418	case 0x2588: XFillRectangle (d.display->display, d, TGC, x0, y0, W, H); break;
		419	case 0x2589: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 7 - 1) / 8, H); break;
		420	case 0x258a: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 6 - 2) / 8, H); break;
		421	case 0x258b: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 5 - 3) / 8, H); break;
		422	case 0x258c: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 4 - 4) / 8, H); break;
		423	case 0x258d: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 3 - 5) / 8, H); break;
		424	case 0x258e: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 2 - 6) / 8, H); break;
		425	case 0x258f: XFillRectangle (d.display->display, d, TGC, x0, y0, (W * 1 - 7) / 8, H); break;
		426	case 0x2590: XFillRectangle (d.display->display, d, TGC, x1, y0, x2 - x1, H); break;
		427
		428	case 0x2591: rect_stipple (d.display->display, d, TGC, 0x00, 0x01, x0, y0, W, H); break;
		429	case 0x2592: rect_stipple (d.display->display, d, TGC, 0x02, 0x01, x0, y0, W, H); break;
		430	case 0x2593: rect_stipple (d.display->display, d, TGC, 0x01, 0x03, x0, y0, W, H); break;
		431
		432	case 0x2594: XFillRectangle (d.display->display, d, TGC, x0, y0, W, (H * 1 - 7) / 8); break;
		433	case 0x2595: XFillRectangle (d.display->display, d, TGC, x0 + (W * 7 - 1) / 8, y0, W - (W * 7 - 1) / 8, H); break;
		434	#endif
		435
348	default:	436	default:
349	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2, r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	437	int w = 0;
		438	while (len > 0 && *text == NOCHAR)
		439	{
		440	++text;
		441	--len;
		442	w += r->TermWin.fwidth;
		443	}
		444
		445	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
		446	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
		447	x += w;
350	}	448	}
351		449
352	x += r->TermWin.fwidth;	450	x += r->TermWin.fwidth;
353	}	451	}
354	}	452	}
…		…
362		460
363	rxvt_fontprop properties ();	461	rxvt_fontprop properties ();
364		462
365	bool load (const rxvt_fontprop &prop);	463	bool load (const rxvt_fontprop &prop);
366		464
367	bool has_codepoint (uint32_t unicode);	465	bool has_codepoint (unicode_t unicode);
368		466
369	void draw (rxvt_drawable &d, int x, int y,	467	void draw (rxvt_drawable &d, int x, int y,
370	const text_t *text, int len,	468	const text_t *text, int len,
371	int fg, int bg);	469	int fg, int bg);
372		470
…		…
429		527
430	bool	528	bool
431	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	529	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
432	{	530	{
433	int slashes = 0;	531	int slashes = 0;
434	const char *comp[12];	532	const char *comp[13];
435		533
436	for (const char c = name; c; c++)	534	for (const char c = name; c; c++)
437	if (*c == '-')	535	if (*c == '-')
438	{	536	{
439	comp[slashes++] = c + 1;	537	comp[slashes++] = c + 1;
…		…
619	f = 0;	717	f = 0;
620	}	718	}
621	}	719	}
622		720
623	bool	721	bool
624	rxvt_font_x11::has_codepoint (uint32_t unicode)	722	rxvt_font_x11::has_codepoint (unicode_t unicode)
625	{	723	{
626	uint32_t ch = FROM_UNICODE (cs, unicode);	724	uint32_t ch = FROM_UNICODE (cs, unicode);
627		725
628	if (ch == NOCHAR)	726	if (ch == NOCHAR)
629	return false;	727	return false;
…		…
691	{	789	{
692	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	790	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
693		791
694	if (bg == Color_bg && !slow)	792	if (bg == Color_bg && !slow)
695	{	793	{
696	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	794	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
697	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);	795	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
698	}	796	}
699	else	797	else
700	{	798	{
701	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	799	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
702		800
703	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	801	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
704		802
705	if (slow)	803	if (slow)
706	{	804	{
707	do	805	do
708	{	806	{
709	if (xc->byte1 \|\| xc->byte2)	807	if (xc->byte1 \|\| xc->byte2)
710	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);	808	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
711		809
712	x += r->TermWin.fwidth;	810	x += r->TermWin.fwidth;
713	xc++; len--;	811	xc++; len--;
714	}	812	}
715	while (len);	813	while (len);
716	}	814	}
717	else	815	else
718	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);	816	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
719	}	817	}
720	}	818	}
721	else	819	else
722	{	820	{
723	const char *xc = enc_char (text, len, cs, slow);	821	const char *xc = enc_char (text, len, cs, slow);
724		822
725	if (bg == Color_bg && !slow)	823	if (bg == Color_bg && !slow)
726	{	824	{
727	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	825	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
728	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);	826	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
729	}	827	}
730	else	828	else
731	{	829	{
732	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	830	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
733		831
734	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	832	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
735		833
736	if (slow)	834	if (slow)
737	{	835	{
738	do	836	do
739	{	837	{
740	if (*xc)	838	if (*xc)
741	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);	839	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
742		840
743	x += r->TermWin.fwidth;	841	x += r->TermWin.fwidth;
744	xc++; len--;	842	xc++; len--;
745	}	843	}
746	while (len);	844	while (len);
747	}	845	}
748	else	846	else
749	XDrawString (d.display->display, d, GC, x, y + base, xc, len);	847	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
750	}	848	}
751	}	849	}
752	}	850	}
753		851
754	/////////////////////////////////////////////////////////////////////////////	852	/////////////////////////////////////////////////////////////////////////////
…		…
771		869
772	void draw (rxvt_drawable &d, int x, int y,	870	void draw (rxvt_drawable &d, int x, int y,
773	const text_t *text, int len,	871	const text_t *text, int len,
774	int fg, int bg);	872	int fg, int bg);
775		873
776	bool has_codepoint (uint32_t unicode);	874	bool has_codepoint (unicode_t unicode);
777		875
778	protected:	876	protected:
779	XftFont *f;	877	XftFont *f;
780	};	878	};
781		879
…		…
894		992
895	return true;	993	return true;
896	}	994	}
897		995
898	bool	996	bool
899	rxvt_font_xft::has_codepoint (uint32_t unicode)	997	rxvt_font_xft::has_codepoint (unicode_t unicode)
900	{	998	{
901	return XftCharExists (DISPLAY, f, unicode);	999	return XftCharExists (DISPLAY, f, unicode);
902	}	1000	}
903		1001
904	void	1002	void
…		…
1000	f = new rxvt_font_x11;	1098	f = new rxvt_font_x11;
1001	}	1099	}
1002	else	1100	else
1003	f = new rxvt_font_x11;	1101	f = new rxvt_font_x11;
1004		1102
		1103	f->fs = this;
1005	f->set_term (r);	1104	f->set_term (r);
1006	f->set_name (strdup (name));	1105	f->set_name (strdup (name));
1007		1106
1008	f->cs = cs;	1107	f->cs = cs;
1009	f->loaded = false;	1108	f->loaded = false;
…		…
1106		1205
1107	return true;	1206	return true;
1108	}	1207	}
1109		1208
1110	int	1209	int
1111	rxvt_fontset::find_font (uint32_t unicode)	1210	rxvt_fontset::find_font (unicode_t unicode)
1112	{	1211	{
1113	for (unsigned int i = 0; i < fonts.size (); i++)	1212	for (unsigned int i = 0; i < fonts.size (); i++)
1114	{	1213	{
1115	rxvt_font *f = fonts[i];	1214	rxvt_font *f = fonts[i];
1116		1215

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC vs. Revision 1.44 by pcg, Tue Mar 16 04:52:20 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.26 by pcg, Fri Feb 27 02:52:51 2004 UTC vs.
Revision 1.44 by pcg, Tue Mar 16 04:52:20 2004 UTC