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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.40 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.46 by pcg, Tue Mar 16 05:55:51 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
…		…
194	else if (color >= 0)	194	else if (color >= 0)
195	{	195	{
196	#if XFT	196	#if XFT
197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);	197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
198	#else	198	#else
199	XSetForeground (d.display->display, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, TGC, r->PixColors[color]);
200	XFillRectangle (d.display->display, d, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, TGC, x, y, w, h);
201	#endif	201	#endif
202	}	202	}
203	}	203	}
204		204
205	static const char *linedraw_cmds[128] = {	205	#include "table/linedraw.h"
206	"1hH", "2hH", "1vV", "2vV",
207	0, 0, 0, 0,
208	0, 0, 0, 0,
209	"1HV", "2H1V", "1H2V", "2HV",
210
211	// 2510
212	"1hV", "2h1V", "1h2V", "2hV",
213	"1Hv", "2H1v", "1H2v", "2Hv",
214	"1hv", "2h1v", "1h2v", "2hv",
215	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
216
217	// 2520
218	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
219	"1hvV", "2h1vV", "1hV2v", "1hv2V",
220	"1h2vV", "2hv1V", "1v2hV", "2hvV",
221	"1hHV", "2h1HV", "2H1hV", "2hH1V",
222
223	// 2530
224	"1hH2V", "2hV1H", "1h2HV", "2hHV",
225	"1hHv", "1vH2h", "1hv2H", "1v2hH",
226	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
227	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
228
229	// 2540
230	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
231	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
232	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
233	0, 0, 0, 0,
234
235	// 2550
236	0, 0, 0, 0,
237	0, 0, 0, 0,
238	0, 0, 0, 0,
239	0, 0, 0, 0,
240
241	// 2560
242	0, 0, 0, 0,
243	0, 0, 0, 0,
244	0, 0, 0, 0,
245	0, 0, 0, 0,
246
247	// 2570
248	0, "1a", "1b", "1ab",
249	"1h", "1v", "1H", "1V",
250	"2h", "2v", "2H", "2V",
251	"1h2H", "1v2V", "1H2h", "1V2v"
252
253	// to be done
254	};
255		206
256	struct rxvt_font_default : rxvt_font {	207	struct rxvt_font_default : rxvt_font {
		208
257	rxvt_fontprop properties ()	209	rxvt_fontprop properties ()
258	{	210	{
259	rxvt_fontprop p;	211	rxvt_fontprop p;
260		212
261	p.width = p.height = 1;	213	p.width = p.height = 1;
…		…
268	bool load (const rxvt_fontprop &prop)	220	bool load (const rxvt_fontprop &prop)
269	{	221	{
270	width = 1; height = 1;	222	width = 1; height = 1;
271	ascent = 1; descent = 0;	223	ascent = 1; descent = 0;
272		224
273	set_name ("built-in pseudofont");	225	set_name (strdup ("built-in pseudofont"));
274		226
275	return true;	227	return true;
276	}	228	}
277		229
278	bool has_codepoint (unicode_t unicode)	230	bool has_codepoint (unicode_t unicode)
…		…
281	return true;	233	return true;
282		234
283	if (unicode >= 0x0080 && unicode <= 0x009f)	235	if (unicode >= 0x0080 && unicode <= 0x009f)
284	return true;	236	return true;
285		237
286	if (unicode >= 0x2500 && unicode <= 0x257f	238	if (unicode >= 0x2500 && unicode <= 0x259f
287	&& linedraw_cmds[unicode - 0x2500])	239	&& linedraw_offs[unicode - 0x2500] & 15)
288	return true;	240	return true;
289		241
290	if (IS_COMPOSE (unicode))	242	if (IS_COMPOSE (unicode))
291	return true;	243	return true;
292		244
…		…
309	const text_t *text, int len,	261	const text_t *text, int len,
310	int fg, int bg)	262	int fg, int bg)
311	{	263	{
312	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	264	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
313		265
314	XSetForeground (d.display->display, GC, r->PixColors[fg]);	266	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
315		267
316	while (len--)	268	while (len--)
317	{	269	{
318	#if ENABLE_COMBINING	270	#if ENABLE_COMBINING
319	compose_char *cc;	271	compose_char *cc;
320	#endif	272	#endif
321	text_t t = *text++;	273	text_t t = *text++;
322		274
323	// is it in our linedrawing table?	275	int W = r->TermWin.fwidth , w = (W - 1) / 2;
324	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	276	int H = r->TermWin.fheight, h = (H - 1) / 2;
		277	int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
		278	int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
		279
		280	if (0x2500 <= t && t <= 0x259f
		281	&& linedraw_offs[t - 0x2500] & 15)
		282	{
		283	uint16_t offs = linedraw_offs[t - 0x2500];
		284	uint32_t *a = linedraw_command + (offs >> 4);
		285	uint32_t *b = a + (offs & 15);
		286
		287	int x_[16];
		288	int y_[16];
		289
		290	for (int i = 0; i <= 8; i++)
325	{	291	{
326	const char *p = linedraw_cmds[t - 0x2500];	292	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		293	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
		294	}
327		295
328	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;	296	x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
329	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;	297	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
330		298
331	XGCValues gcv;	299	XGCValues gcv;
332		300
		301	gcv.cap_style = CapButt;
		302	gcv.line_width = 0;
		303	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		304
333	while (*p)	305	while (a < b)
334	{	306	{
		307	uint32_t command = *a++;
		308
		309	int op = (command >> 24) & 255;
		310	int a = (command >> 20) & 15;
		311	int b = (command >> 16) & 15;
		312	int x1 = x_[(command >> 12) & 15];
		313	int y1 = y_[(command >> 8) & 15];
		314	int x2 = x_[(command >> 4) & 15];
		315	int y2 = y_[(command >> 0) & 15];
		316
335	switch (*p++)	317	switch (op)
336	{	318	{
337	case '1':	319	case 0: // line
338	gcv.line_width = 0;	320	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
339	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
340	break;	321	break;
341		322
342	case '2':	323	case 1: // rectangle, possibly stippled
		324	if (a)
		325	{
		326	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
		327
		328	gcv.fill_style = FillStippled;
		329	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		330	gcv.ts_x_origin = x;
		331	gcv.ts_y_origin = y;
		332
		333	XChangeGC (d.display->display, TGC,
		334	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		335	&gcv);
		336	}
		337
		338
		339	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		340
		341	if (a)
		342	{
		343	XFreePixmap (d.display->display, gcv.stipple);
343	gcv.line_width = 2;	344	gcv.stipple = 0;
		345	gcv.fill_style = FillSolid;
344	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	346	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		347	}
		348
345	break;	349	break;
346		350	case 2: // arc
347	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;	351	XDrawArc (d.display->display, d, TGC,
348	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;	352	x1 - W/2, y1 - H/2, W-1, H-1,
349	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;	353	(a - 1) * 9064, (b - 1) 90*64);
350	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;	354	break;
351	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
352	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
353	}	355	}
354	}	356	}
355
356	gcv.line_width = 0;
357	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
358	}	357	}
359	#if ENABLE_COMBINING	358	#if ENABLE_COMBINING
360	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	359	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
361	{	360	{
362	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	361	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
…		…
375	else	374	else
376	switch (t)	375	switch (t)
377	{	376	{
378	case ZERO_WIDTH_CHAR:	377	case ZERO_WIDTH_CHAR:
379	break;	378	break;
		379
380	default:	380	default:
381	int w = 0;	381	int w = 0;
382	while (len > 0 && *text == NOCHAR)	382	while (len > 0 && *text == NOCHAR)
383	{	383	{
384	++text;	384	++text;
385	--len;	385	--len;
386	w += r->TermWin.fwidth;	386	w += r->TermWin.fwidth;
387	}	387	}
388		388
389	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,	389	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
390	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	390	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
391	x += w;	391	x += w;
392	}	392	}
393		393
394	x += r->TermWin.fwidth;	394	x += r->TermWin.fwidth;
395	}	395	}
…		…
733	{	733	{
734	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	734	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
735		735
736	if (bg == Color_bg && !slow)	736	if (bg == Color_bg && !slow)
737	{	737	{
738	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	738	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
739	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);	739	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
740	}	740	}
741	else	741	else
742	{	742	{
743	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	743	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
744		744
745	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	745	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
746		746
747	if (slow)	747	if (slow)
748	{	748	{
749	do	749	do
750	{	750	{
751	if (xc->byte1 \|\| xc->byte2)	751	if (xc->byte1 \|\| xc->byte2)
752	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);	752	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
753		753
754	x += r->TermWin.fwidth;	754	x += r->TermWin.fwidth;
755	xc++; len--;	755	xc++; len--;
756	}	756	}
757	while (len);	757	while (len);
758	}	758	}
759	else	759	else
760	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);	760	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
761	}	761	}
762	}	762	}
763	else	763	else
764	{	764	{
765	const char *xc = enc_char (text, len, cs, slow);	765	const char *xc = enc_char (text, len, cs, slow);
766		766
767	if (bg == Color_bg && !slow)	767	if (bg == Color_bg && !slow)
768	{	768	{
769	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	769	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
770	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);	770	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
771	}	771	}
772	else	772	else
773	{	773	{
774	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	774	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
775		775
776	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	776	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
777		777
778	if (slow)	778	if (slow)
779	{	779	{
780	do	780	do
781	{	781	{
782	if (*xc)	782	if (*xc)
783	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);	783	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
784		784
785	x += r->TermWin.fwidth;	785	x += r->TermWin.fwidth;
786	xc++; len--;	786	xc++; len--;
787	}	787	}
788	while (len);	788	while (len);
789	}	789	}
790	else	790	else
791	XDrawString (d.display->display, d, GC, x, y + base, xc, len);	791	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
792	}	792	}
793	}	793	}
794	}	794	}
795		795
796	/////////////////////////////////////////////////////////////////////////////	796	/////////////////////////////////////////////////////////////////////////////

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.40 by pcg, Mon Mar 15 00:08:11 2004 UTC vs. Revision 1.46 by pcg, Tue Mar 16 05:55:51 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.40 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.46 by pcg, Tue Mar 16 05:55:51 2004 UTC