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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.34 by pcg, Thu Mar 4 04:28:50 2004 UTC vs.
Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC

…		…
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
…		…
201	#endif	201	#endif
202	}	202	}
203	}	203	}
204		204
205	static const char *linedraw_cmds[128] = {	205	static const char *linedraw_cmds[128] = {
206	"1hH", "2hH", "1vV", "2vV",	206	"1-", "2-", "1\|", "2\|",
207	0, 0, 0, 0,	207	0, 0, 0, 0,
208	0, 0, 0, 0,	208	0, 0, 0, 0,
209	"1HV", "2H1V", "1H2V", "2HV",	209	"1HV", "2H1V", "1H2V", "2HV",
210		210
211	// 2510	211	// 2510
212	"1hV", "2h1V", "1h2V", "2hV",	212	"1hV", "2h1V", "1h2V", "2hV",
213	"1Hv", "2H1v", "1H2v", "2Hv",	213	"1Hv", "2H1v", "1H2v", "2Hv",
214	"1hv", "2h1v", "1h2v", "2hv",	214	"1hv", "2h1v", "1h2v", "2hv",
215	"1HvV", "2H1vV", "1HV2v", "1Hv2V",	215	"1H\|", "2H1\|", "1HV2v", "1Hv2V",
216		216
217	// 2520	217	// 2520
218	"1H2vV", "2Hv1V", "2HV1v", "2HvV",	218	"1H2\|", "2Hv1V", "2HV1v", "2H\|",
219	"1hvV", "2h1vV", "1hV2v", "1hv2V",	219	"1h\|", "2h1\|", "1hV2v", "1hv2V",
220	"1h2vV", "2hv1V", "1v2hV", "2hvV",	220	"1h2\|", "2hv1V", "1v2hV", "2h\|",
221	"1hHV", "2h1HV", "2H1hV", "2hH1V",	221	"1-V", "2h1HV", "2H1hV", "2-1V",
222		222
223	// 2530	223	// 2530
224	"1hH2V", "2hV1H", "1h2HV", "2hHV",	224	"1-2V", "2hV1H", "1h2HV", "2-V",
225	"1hHv", "1vH2h", "1hv2H", "1v2hH",	225	"1-v", "1vH2h", "1hv2H", "1v2-",
226	"1hH2v", "1H2hv", "1h2Hv", "2hHv",	226	"1-2v", "1H2hv", "1h2Hv", "2-v",
227	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",	227	"1-\|", "1\|H2h", "1h\|2H", "1\|2-",
228		228
229	// 2540	229	// 2540
230	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",	230	"1-V2v", "1-v2V", "1-2\|", "1HV2hv",
231	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",	231	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2-v",
232	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",	232	"1v2-V", "1H2h\|", "1h2H\|", "2-\|",
233	0, 0, 0, 0,	233	0, 0, 0, 0,
234		234
235	// 2550	235	// 2550
236	0, 0, 0, 0,	236	0, 0, 0, 0,
237	0, 0, 0, 0,	237	0, 0, 0, 0,
…		…
240		240
241	// 2560	241	// 2560
242	0, 0, 0, 0,	242	0, 0, 0, 0,
243	0, 0, 0, 0,	243	0, 0, 0, 0,
244	0, 0, 0, 0,	244	0, 0, 0, 0,
245	0, 0, 0, 0,	245	0, "A", "B", "C",
246		246
247	// 2570	247	// 2570
248	0, "1a", "1b", "1ab",	248	"D", "1/", "1\\", "1/\\",
249	"1h", "1v", "1H", "1V",	249	"1h", "1v", "1H", "1V",
250	"2h", "2v", "2H", "2V",	250	"2h", "2v", "2H", "2V",
251	"1h2H", "1v2V", "1H2h", "1V2v"	251	"1h2H", "1v2V", "1H2h", "1V2v"
252		252
253	// to be done	253	// to be done
…		…
268	bool load (const rxvt_fontprop &prop)	268	bool load (const rxvt_fontprop &prop)
269	{	269	{
270	width = 1; height = 1;	270	width = 1; height = 1;
271	ascent = 1; descent = 0;	271	ascent = 1; descent = 0;
272		272
		273	set_name ("built-in pseudofont");
		274
273	return true;	275	return true;
274	}	276	}
275		277
276	bool has_codepoint (uint32_t unicode)	278	bool has_codepoint (unicode_t unicode)
277	{	279	{
278	if (unicode <= 0x001f)	280	if (unicode <= 0x001f)
279	return true;	281	return true;
280		282
281	if (unicode >= 0x0080 && unicode <= 0x009f)	283	if (unicode >= 0x0080 && unicode <= 0x009f)
…		…
283		285
284	if (unicode >= 0x2500 && unicode <= 0x257f	286	if (unicode >= 0x2500 && unicode <= 0x257f
285	&& linedraw_cmds[unicode - 0x2500])	287	&& linedraw_cmds[unicode - 0x2500])
286	return true;	288	return true;
287		289
288	if (IS_PSEUDO (unicode))	290	if (IS_COMPOSE (unicode))
289	return true;	291	return true;
290		292
291	switch (unicode)	293	switch (unicode)
292	{	294	{
293	case ZERO_WIDTH_CHAR:	295	case ZERO_WIDTH_CHAR:
…		…
311		313
312	XSetForeground (d.display->display, GC, r->PixColors[fg]);	314	XSetForeground (d.display->display, GC, r->PixColors[fg]);
313		315
314	while (len--)	316	while (len--)
315	{	317	{
		318	#if ENABLE_COMBINING
		319	compose_char *cc;
		320	#endif
316	text_t t = *text++;	321	text_t t = *text++;
317		322
318	// is it in our linedrawing table?	323	// is it in our linedrawing table?
319	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	324	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])
320	{	325	{
321	const char *p = linedraw_cmds[t - 0x2500];	326	const char *p = linedraw_cmds[t - 0x2500];
322		327
323	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;	328	int W = r->TermWin.fwidth , w = (W - 1) / 2;
324	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;	329	int H = r->TermWin.fheight, h = (H - 1) / 2;
		330	int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
		331	int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
325		332
326	XGCValues gcv;	333	XGCValues gcv;
		334
		335	gcv.cap_style = CapNotLast;
		336	XChangeGC (d.display->display, GC, GCCapStyle, &gcv);
327		337
328	while (*p)	338	while (*p)
329	{	339	{
330	switch (*p++)	340	switch (*p++)
331	{	341	{
…		…
333	gcv.line_width = 0;	343	gcv.line_width = 0;
334	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	344	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
335	break;	345	break;
336		346
337	case '2':	347	case '2':
338	gcv.line_width = 2;	348	gcv.line_width = 3;
339	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	349	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
340	break;	350	break;
341		351
342	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;	352	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1+1, y1 ); break;
343	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;	353	case 'H': XDrawLine (d.display->display, d, GC, x2, y1, x1-1, y1 ); break;
		354	case '-': XDrawLine (d.display->display, d, GC, x0, y1, x2 , y1 ); break;
344	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;	355	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y1+1); break;
		356	case 'V': XDrawLine (d.display->display, d, GC, x1, y2, x1 , y1-1); break;
345	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;	357	case '\|': XDrawLine (d.display->display, d, GC, x1, y0, x1 , y2 ); break;
		358
346	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;	359	case '/' : XDrawLine (d.display->display, d, GC, x0, y2, x2 , y0 ); break;
347	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;	360	case '\\': XDrawLine (d.display->display, d, GC, x0, y0, x2 , y2 ); break;
		361
		362	case 'A': XDrawArc (d.display->display, d, GC, x1 , y1 , W-1, H-1, 9064, 9064); break;
		363	case 'B': XDrawArc (d.display->display, d, GC, x1-W+1, y1 , W-1, H-1, 064, 9064); break;
		364	case 'C': XDrawArc (d.display->display, d, GC, x1-W+1, y1-H+1, W-1, H-1, 064, -9064); break;
		365	case 'D': XDrawArc (d.display->display, d, GC, x1 , y1-H+1, W-1, H-1, -9064, -9064); break;
348	}	366	}
349	}	367	}
350		368
351	gcv.line_width = 0;	369	gcv.line_width = 0;
352	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	370	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
353	}	371	}
354	else if (IS_PSEUDO (t))	372
355	{	373	#if ENABLE_COMBINING
356	const compose_char &cc = r->composite (t);	374	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
357	(void)0; //D ADD pseudo handling here
358	}	375	{
		376	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		377	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		378	if (cc->c2 != NOCHAR)
		379	{
		380	// prefer font of first character, for no good reasons
		381	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		382	? f1
		383	: (*fs)[fs->find_font (cc->c2)];
		384
		385	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		386	}
		387	}
		388	#endif
359	else	389	else
360	switch (t)	390	switch (t)
361	{	391	{
362	case ZERO_WIDTH_CHAR:	392	case ZERO_WIDTH_CHAR:
363	break;	393	break;
…		…
388		418
389	rxvt_fontprop properties ();	419	rxvt_fontprop properties ();
390		420
391	bool load (const rxvt_fontprop &prop);	421	bool load (const rxvt_fontprop &prop);
392		422
393	bool has_codepoint (uint32_t unicode);	423	bool has_codepoint (unicode_t unicode);
394		424
395	void draw (rxvt_drawable &d, int x, int y,	425	void draw (rxvt_drawable &d, int x, int y,
396	const text_t *text, int len,	426	const text_t *text, int len,
397	int fg, int bg);	427	int fg, int bg);
398		428
…		…
645	f = 0;	675	f = 0;
646	}	676	}
647	}	677	}
648		678
649	bool	679	bool
650	rxvt_font_x11::has_codepoint (uint32_t unicode)	680	rxvt_font_x11::has_codepoint (unicode_t unicode)
651	{	681	{
652	uint32_t ch = FROM_UNICODE (cs, unicode);	682	uint32_t ch = FROM_UNICODE (cs, unicode);
653		683
654	if (ch == NOCHAR)	684	if (ch == NOCHAR)
655	return false;	685	return false;
…		…
797		827
798	void draw (rxvt_drawable &d, int x, int y,	828	void draw (rxvt_drawable &d, int x, int y,
799	const text_t *text, int len,	829	const text_t *text, int len,
800	int fg, int bg);	830	int fg, int bg);
801		831
802	bool has_codepoint (uint32_t unicode);	832	bool has_codepoint (unicode_t unicode);
803		833
804	protected:	834	protected:
805	XftFont *f;	835	XftFont *f;
806	};	836	};
807		837
…		…
920		950
921	return true;	951	return true;
922	}	952	}
923		953
924	bool	954	bool
925	rxvt_font_xft::has_codepoint (uint32_t unicode)	955	rxvt_font_xft::has_codepoint (unicode_t unicode)
926	{	956	{
927	return XftCharExists (DISPLAY, f, unicode);	957	return XftCharExists (DISPLAY, f, unicode);
928	}	958	}
929		959
930	void	960	void
…		…
1026	f = new rxvt_font_x11;	1056	f = new rxvt_font_x11;
1027	}	1057	}
1028	else	1058	else
1029	f = new rxvt_font_x11;	1059	f = new rxvt_font_x11;
1030		1060
		1061	f->fs = this;
1031	f->set_term (r);	1062	f->set_term (r);
1032	f->set_name (strdup (name));	1063	f->set_name (strdup (name));
1033		1064
1034	f->cs = cs;	1065	f->cs = cs;
1035	f->loaded = false;	1066	f->loaded = false;
…		…
1132		1163
1133	return true;	1164	return true;
1134	}	1165	}
1135		1166
1136	int	1167	int
1137	rxvt_fontset::find_font (uint32_t unicode)	1168	rxvt_fontset::find_font (unicode_t unicode)
1138	{	1169	{
1139	for (unsigned int i = 0; i < fonts.size (); i++)	1170	for (unsigned int i = 0; i < fonts.size (); i++)
1140	{	1171	{
1141	rxvt_font *f = fonts[i];	1172	rxvt_font *f = fonts[i];
1142		1173

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.34 by pcg, Thu Mar 4 04:28:50 2004 UTC vs. Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.34 by pcg, Thu Mar 4 04:28:50 2004 UTC vs.
Revision 1.42 by pcg, Mon Mar 15 06:13:35 2004 UTC