/*
* $Log$
+ * Revision 1.7 2008/02/20 20:16:07 james
+ * *** empty log message ***
+ *
* Revision 1.6 2008/02/20 19:44:37 james
* @@
*
if (client_socket)
socket_pre_select (client_socket, &rfds, &wfds);
- if (ansi)
+ if (ansi && ansi->terminal)
tty_pre_select (ansi->terminal, &rfds, &wfds);
select (FD_SETSIZE, &rfds, &wfds, NULL, &tv);
/*any data from the server */
if (client_socket)
{
+ int one_shot;
if (socket_post_select (client_socket, &rfds, &wfds))
break;
while (client_socket->msg)
{
if (msg_from_server (ansi,client_socket->msg, &c))
- break;
+ one_shot++;
+
socket_consume_msg (client_socket);
}
+ if (one_shot) break;
}
/*
* $Log$
+ * Revision 1.3 2008/02/20 20:16:07 james
+ * *** empty log message ***
+ *
* Revision 1.2 2008/02/04 02:05:06 james
* *** empty log message ***
*
#include "project.h"
-void
+
+#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 void
html_entity (FILE * f, int c)
{
switch (c)
}
}
-void
+static void
html_render (FILE * f, CRT_CA c)
{
+int fg,bg;
+
if (c.attr & CRT_ATTR_REVERSE)
{
- fprintf (f, "<td bgcolor='#000000'><font color='#ffffff'>");
+ fg=CRT_COLOR_BG(c.color);
+ bg=CRT_COLOR_FG(c.color);
}
else
{
- fprintf (f, "<td>");
+ fg=CRT_COLOR_FG(c.color);
+ bg=CRT_COLOR_BG(c.color);
+ if (c.attr & CRT_ATTR_BOLD)
+ fg|=CRT_COLOR_INTENSITY;
}
+ fprintf (f, "<td bgcolor='#%06x'><font color='#%06x'>",colormap[bg],colormap[fg]);
if (c.attr & CRT_ATTR_UNDERLINE)
fprintf (f, "<ul>");
fprintf (f, "</td>");
}
-void
+static void
html_draw (FILE * f, CRT * c)
{
CRT_Pos p;
{
o = CRT_ADDR (p.y, 0);
fprintf (f, "<tr>");
- for (p.x = 0; p.x < CRT_ROWS; ++p.x, ++o)
+ for (p.x = 0; p.x < CRT_COLS; ++p.x, ++o)
{
html_render (f, c->screen[o]);
}
}
fprintf (f, "</table>\n");
}
+
+
+static void html_one_shot(ANSI *a,CRT *c)
+{
+html_draw(a->file,c);
+}
+
+
+static void ansi_free(ANSI *a)
+{
+free(a);
+}
+
+ANSI *ansi_new_html(FILE *f)
+{
+ANSI *ret;
+
+ret=malloc(sizeof(ANSI));
+memset(ret,0,sizeof(ANSI));
+
+ret->file=f;
+ret->close=ansi_free;
+ret->one_shot=html_one_shot;
+
+return ret;
+}
+
+
+
+
/* ansi.c */
extern int ansi_dispatch(ANSI *a, Context *c);
-extern ANSI *ansi_new_from_terminal(ANSI *a, TTY *t);
+extern ANSI *ansi_new_from_terminal(TTY *t);
/* crt.c */
extern void crt_erase(CRT *c, CRT_Pos s, CRT_Pos e, int ea);
extern void crt_cls(CRT *c);
extern void crt_reset(CRT *c);
extern void crt_insert(CRT *c, CRT_CA ca);
/* html.c */
-extern void html_entity(FILE *f, int c);
-extern void html_render(FILE *f, CRT_CA c);
-extern void html_draw(FILE *f, CRT *c);
+extern ANSI *ansi_new_html(FILE *f);
/* libsympathy.c */
/* render.c */
/* version.c */