From c1aa93b7aa74d01cf1d1686e0c90decc24a344c6 Mon Sep 17 00:00:00 2001 From: staffcvs <> Date: Wed, 20 Feb 2008 22:54:22 +0000 Subject: *** empty log message *** --- src/html.c | 88 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 43 deletions(-) (limited to 'src/html.c') diff --git a/src/html.c b/src/html.c index 6aefce3..b1d6ce9 100644 --- a/src/html.c +++ b/src/html.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.4 2008/02/20 22:54:22 staffcvs + * *** empty log message *** + * * Revision 1.3 2008/02/20 20:16:07 james * *** empty log message *** * @@ -27,24 +30,23 @@ static char rcsid[] = "$Id$"; #define V(i) (((i)==0)?0x80:(((i)==1)?0xc0:0xff)) #define COLOR(r,g,b,i) ((((r)?(V(i)):0) << 0)| (((g)?(V(i)):0) << 8)| (((b)?(V(i)):0) << 16)) -static int colormap[]= -{ -[CRT_COLOR_BLACK]=COLOR(0,0,0,0), -[CRT_COLOR_RED]=COLOR(0,0,1,0), -[CRT_COLOR_GREEN]=COLOR(0,1,0,0), -[CRT_COLOR_YELLOW]=COLOR(0,1,1,0), -[CRT_COLOR_BLUE]=COLOR(1,0,0,0), -[CRT_COLOR_MAGENTA]=COLOR(1,0,1,0), -[CRT_COLOR_CYAN]=COLOR(1,1,0,0), -[CRT_COLOR_WHITE]=COLOR(1,1,1,1), -[CRT_COLOR_BLACK|CRT_COLOR_INTENSITY]=COLOR(1,1,1,0), -[CRT_COLOR_RED|CRT_COLOR_INTENSITY]=COLOR(0,0,1,2), -[CRT_COLOR_GREEN|CRT_COLOR_INTENSITY]=COLOR(0,1,0,2), -[CRT_COLOR_YELLOW|CRT_COLOR_INTENSITY]=COLOR(0,1,1,2), -[CRT_COLOR_BLUE|CRT_COLOR_INTENSITY]=COLOR(1,0,0,2), -[CRT_COLOR_MAGENTA|CRT_COLOR_INTENSITY]=COLOR(1,0,1,2), -[CRT_COLOR_CYAN|CRT_COLOR_INTENSITY]=COLOR(1,1,0,2), -[CRT_COLOR_WHITE|CRT_COLOR_INTENSITY]=COLOR(1,1,1,2), +static int colormap[] = { + [CRT_COLOR_BLACK] = COLOR (0, 0, 0, 0), + [CRT_COLOR_RED] = COLOR (0, 0, 1, 0), + [CRT_COLOR_GREEN] = COLOR (0, 1, 0, 0), + [CRT_COLOR_YELLOW] = COLOR (0, 1, 1, 0), + [CRT_COLOR_BLUE] = COLOR (1, 0, 0, 0), + [CRT_COLOR_MAGENTA] = COLOR (1, 0, 1, 0), + [CRT_COLOR_CYAN] = COLOR (1, 1, 0, 0), + [CRT_COLOR_WHITE] = COLOR (1, 1, 1, 1), + [CRT_COLOR_BLACK | CRT_COLOR_INTENSITY] = COLOR (1, 1, 1, 0), + [CRT_COLOR_RED | CRT_COLOR_INTENSITY] = COLOR (0, 0, 1, 2), + [CRT_COLOR_GREEN | CRT_COLOR_INTENSITY] = COLOR (0, 1, 0, 2), + [CRT_COLOR_YELLOW | CRT_COLOR_INTENSITY] = COLOR (0, 1, 1, 2), + [CRT_COLOR_BLUE | CRT_COLOR_INTENSITY] = COLOR (1, 0, 0, 2), + [CRT_COLOR_MAGENTA | CRT_COLOR_INTENSITY] = COLOR (1, 0, 1, 2), + [CRT_COLOR_CYAN | CRT_COLOR_INTENSITY] = COLOR (1, 1, 0, 2), + [CRT_COLOR_WHITE | CRT_COLOR_INTENSITY] = COLOR (1, 1, 1, 2), }; @@ -73,21 +75,22 @@ html_entity (FILE * f, int c) static void html_render (FILE * f, CRT_CA c) { -int fg,bg; - + int fg, bg; + if (c.attr & CRT_ATTR_REVERSE) { - fg=CRT_COLOR_BG(c.color); - bg=CRT_COLOR_FG(c.color); + fg = CRT_COLOR_BG (c.color); + bg = CRT_COLOR_FG (c.color); } else { - fg=CRT_COLOR_FG(c.color); - bg=CRT_COLOR_BG(c.color); - if (c.attr & CRT_ATTR_BOLD) - fg|=CRT_COLOR_INTENSITY; + fg = CRT_COLOR_FG (c.color); + bg = CRT_COLOR_BG (c.color); + if (c.attr & CRT_ATTR_BOLD) + fg |= CRT_COLOR_INTENSITY; } - fprintf (f, "",colormap[bg],colormap[fg]); + fprintf (f, "", colormap[bg], + colormap[fg]); if (c.attr & CRT_ATTR_UNDERLINE) fprintf (f, "