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

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.41 by pcg, Mon Mar 15 01:27:46 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[] = {
…		…
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
205	static const char *linedraw_cmds[128] = {
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		204
256	struct rxvt_font_default : rxvt_font {	205	struct rxvt_font_default : rxvt_font {
257	rxvt_fontprop properties ()	206	rxvt_fontprop properties ()
258	{	207	{
259	rxvt_fontprop p;	208	rxvt_fontprop p;
…		…
281	return true;	230	return true;
282		231
283	if (unicode >= 0x0080 && unicode <= 0x009f)	232	if (unicode >= 0x0080 && unicode <= 0x009f)
284	return true;	233	return true;
285		234
286	if (unicode >= 0x2500 && unicode <= 0x257f	235	if (unicode >= 0x2500 && unicode <= 0x259f)
287	&& linedraw_cmds[unicode - 0x2500])
288	return true;	236	return true;
289		237
290	if (IS_COMPOSE (unicode))	238	if (IS_COMPOSE (unicode))
291	return true;	239	return true;
292		240
…		…
302	void draw (rxvt_drawable &d, int x, int y,	250	void draw (rxvt_drawable &d, int x, int y,
303	const text_t *text, int len,	251	const text_t *text, int len,
304	int fg, int bg);	252	int fg, int bg);
305	};	253	};
306		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
307	void	279	void
308	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	280	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
309	const text_t *text, int len,	281	const text_t *text, int len,
310	int fg, int bg)	282	int fg, int bg)
311	{	283	{
312	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);
313		285
314	XSetForeground (d.display->display, GC, r->PixColors[fg]);	286	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
315		287
316	while (len--)	288	while (len--)
317	{	289	{
318	#if ENABLE_COMBINING	290	#if ENABLE_COMBINING
319	compose_char *cc;	291	compose_char *cc;
320	#endif	292	#endif
321	text_t t = *text++;	293	text_t t = *text++;
322		294
323	// is it in our linedrawing table?	295	int x_[16];
324	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	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;
325	{	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
326	const char *p = linedraw_cmds[t - 0x2500];	312	int i1 = linedraw_offs[t - 0x2500];
		313	int i2 = linedraw_offs[t - 0x2500 + 1];
327		314
328	int x0 = x, x1 = x + (r->TermWin.fwidth - 1) / 2, x2 = x + r->TermWin.fwidth - 1;
329	int y0 = y, y1 = y + (r->TermWin.fheight - 1) / 2, y2 = y + r->TermWin.fheight - 1;
330
331	XGCValues gcv;	315	XGCValues gcv;
332		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	{
333	while (*p)	323	while (i1 < i2)
334	{	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
335	switch (*p++)	335	switch (op)
336	{	336	{
337	case '1':	337	case 0: // line
338	gcv.line_width = 0;	338	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
339	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
340	break;	339	break;
341		340
342	case '2':	341	case 1: // rectangle, possibly stippled
343	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;
344	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	363	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		364	}
		365
345	break;	366	break;
346		367	case 2: // arc
347	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;	368	break;
348	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;
349	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;
350	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); 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	}	369	}
354	}	370	}
355		371
356	gcv.line_width = 0;	372	#if 0
357	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
358	}	386	}
359	#if ENABLE_COMBINING	387	#if ENABLE_COMBINING
360	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))	388	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
361	{	389	{
362	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];	390	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
…		…
375	else	403	else
376	switch (t)	404	switch (t)
377	{	405	{
378	case ZERO_WIDTH_CHAR:	406	case ZERO_WIDTH_CHAR:
379	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
380	default:	436	default:
381	int w = 0;	437	int w = 0;
382	while (len > 0 && *text == NOCHAR)	438	while (len > 0 && *text == NOCHAR)
383	{	439	{
384	++text;	440	++text;
385	--len;	441	--len;
386	w += r->TermWin.fwidth;	442	w += r->TermWin.fwidth;
387	}	443	}
388		444
389	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,	445	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
390	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	446	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
391	x += w;	447	x += w;
392	}	448	}
393		449
394	x += r->TermWin.fwidth;	450	x += r->TermWin.fwidth;
395	}	451	}
…		…
733	{	789	{
734	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	790	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
735		791
736	if (bg == Color_bg && !slow)	792	if (bg == Color_bg && !slow)
737	{	793	{
738	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	794	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
739	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);	795	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
740	}	796	}
741	else	797	else
742	{	798	{
743	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);
744		800
745	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	801	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
746		802
747	if (slow)	803	if (slow)
748	{	804	{
749	do	805	do
750	{	806	{
751	if (xc->byte1 \|\| xc->byte2)	807	if (xc->byte1 \|\| xc->byte2)
752	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);	808	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
753		809
754	x += r->TermWin.fwidth;	810	x += r->TermWin.fwidth;
755	xc++; len--;	811	xc++; len--;
756	}	812	}
757	while (len);	813	while (len);
758	}	814	}
759	else	815	else
760	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);	816	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
761	}	817	}
762	}	818	}
763	else	819	else
764	{	820	{
765	const char *xc = enc_char (text, len, cs, slow);	821	const char *xc = enc_char (text, len, cs, slow);
766		822
767	if (bg == Color_bg && !slow)	823	if (bg == Color_bg && !slow)
768	{	824	{
769	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	825	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
770	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);	826	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
771	}	827	}
772	else	828	else
773	{	829	{
774	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);
775		831
776	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	832	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
777		833
778	if (slow)	834	if (slow)
779	{	835	{
780	do	836	do
781	{	837	{
782	if (*xc)	838	if (*xc)
783	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);	839	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
784		840
785	x += r->TermWin.fwidth;	841	x += r->TermWin.fwidth;
786	xc++; len--;	842	xc++; len--;
787	}	843	}
788	while (len);	844	while (len);
789	}	845	}
790	else	846	else
791	XDrawString (d.display->display, d, GC, x, y + base, xc, len);	847	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
792	}	848	}
793	}	849	}
794	}	850	}
795		851
796	/////////////////////////////////////////////////////////////////////////////	852	/////////////////////////////////////////////////////////////////////////////

Diff Legend

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

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.41 by pcg, Mon Mar 15 01:27:46 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.41 by pcg, Mon Mar 15 01:27:46 2004 UTC vs.
Revision 1.44 by pcg, Tue Mar 16 04:52:20 2004 UTC