*** empty log message ***

5 files changed, 318 insertions, 198 deletions

diff --git a/apps/usage.c b/apps/usage.c
index bd15912..b0a91d4 100644
--- a/apps/usage.c
+++ b/apps/usage.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.20  2008/03/06 17:21:41  james
+ * *** empty log message ***
+ *
  * Revision 1.19  2008/03/03 06:04:42  james
  * *** empty log message ***
  *
@@ -78,13 +81,13 @@ usage (void)
 
   fprintf (stderr, "Usage:\n"
            "sympathy -t      [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-w WxH]\n"
-           "                      [-F] [-P pidfile] [-u]\n"
+           "                      [-F] [-P pidfile] [-u] [-N]\n"
            "sympathy -s      [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-w WxH]\n"
-           "                      [-F] [-P pidfile]      [-n hlines] [-k skt]\n"
+           "                      [-F] [-P pidfile]           [-n hlines] [-k skt]\n"
            "sympathy [-s -c] [-K] [-d serialdev|-p] [-b baud] [-f] [-L log] [-w WxH]\n"
-           "                      [-F] [-P pidfile] [-u] [-n hlines] [-k skt]\n"
-           "sympathy -c      [-H] [-u] -k skt\n"
-           "sympathy -r id   [-H] [-u]\n"
+           "                      [-F] [-P pidfile] [-u] [-N] [-n hlines] [-k skt]\n"
+           "sympathy -c      [-H] [-I string ]      [-u] [-N]              -k skt\n"
+           "sympathy -r id   [-H] [-I string ]      [-u] [-N]\n"
            "sympathy {-l|-ls}\n"
            "sympathy -v\n"
            "sympathy -h\n"
@@ -131,7 +134,11 @@ usage (void)
            "   -R  rotate logile specified with -L option\n"
            "   -u  don't emit utf-8 try to use ISO-2202 to the local terminal\n"
            "   -w W[xH]  start session with a screen of size W by H. 0<W<=132,\n"
-           "             0<H<24, default 80 by 24\n");
+           "             0<H<24, default 80 by 24\n"
+	   "   -N  provide dumb terminal emulation on stdin/stdout instead of\n"
+           "              redering the display, for use with expect(1)\n"
+           "   -I string  inject string into terminal then quit (see man page\n"
+	   "                    for escapes\n"); 
 
 
   exit (1);
diff --git a/src/ansi.c b/src/ansi.c
index 39ad34d..a983962 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.45  2008/03/06 17:21:41  james
+ * *** empty log message ***
+ *
  * Revision 1.44  2008/03/06 16:49:05  james
  * *** empty log message ***
  *
@@ -744,7 +747,7 @@ ansi_terminal_reset (ANSI * a)
 }
 
 
-int
+static int
 ansi_key (ANSI * a, Context * c, int key)
 {
   if (!c->d)
@@ -956,7 +959,7 @@ ansi_parse (ANSI * a, Context * c, char *buf, int len)
     ansi_parse_char (a, c, *(buf++));
 }
 
-int
+static int
 ansi_dispatch (ANSI * a, Context * c)
 {
   char buf[1024];
@@ -972,23 +975,6 @@ ansi_dispatch (ANSI * a, Context * c)
   if (red <= 0)
     return red;
 
-#if 0
-  if (*buf == 3)
-    return -1;
-#endif
-
-#if 0
-  if (*buf == 2)
-    {
-#if  0
-      a->history_ptr = c->h->wptr;
-      HISTORY_INC (c->h, a->history_ptr);
-#endif
-      return -1;
-    }
-#endif
-
-
   ansi_parse (a, c, buf, red);
 
   return 0;
diff --git a/src/prototypes.h b/src/prototypes.h
index b79b282..26b0903 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -1,185 +1,180 @@
 /* ansi.c */
-extern int ansi_key (ANSI * a, Context * c, int key);
-extern int ansi_dispatch (ANSI * a, Context * c);
-extern ANSI *ansi_new_from_terminal (TTY * t, int utf8);
+extern ANSI *ansi_new_from_terminal(TTY *t, int utf8);
 /* crt.c */
-extern void crt_erase (CRT * c, CRT_Pos s, CRT_Pos e, int ea, int color);
-extern void crt_cls (CRT * c);
-extern void crt_scroll_up (CRT * c, CRT_Pos s, CRT_Pos e, int ea, int color);
-extern void crt_scroll_down (CRT * c, CRT_Pos s, CRT_Pos e, int ea,
-                             int color);
-extern void crt_reset (CRT * c);
-extern void crt_insert (CRT * c, CRT_CA ca);
+extern void crt_erase(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color);
+extern void crt_cls(CRT *c);
+extern void crt_scroll_up(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color);
+extern void crt_scroll_down(CRT *c, CRT_Pos s, CRT_Pos e, int ea, int color);
+extern void crt_reset(CRT *c);
+extern void crt_insert(CRT *c, CRT_CA ca);
 /* html.c */
-extern ANSI *ansi_new_html (FILE * f);
+extern ANSI *ansi_new_html(FILE *f);
 /* libsympathy.c */
 /* render.c */
 /* version.c */
-extern char *libsympathy_version (void);
+extern char *libsympathy_version(void);
 /* vt102.c */
 extern int vt102_cmd_length[128];
 extern int vt102_cmd_termination[128];
-extern void vt102_crt_update (Context * c);
-extern void vt102_do_resize (Context * c);
-extern void vt102_log_line (Context * c, int line);
-extern void vt102_history (Context * c, CRT_Pos t, CRT_Pos b);
-extern void vt102_clip_cursor (VT102 * v, CRT_Pos tl, CRT_Pos br);
-extern void vt102_cursor_normalize (VT102 * v);
-extern void vt102_cursor_carriage_return (VT102 * v);
-extern void vt102_cursor_advance_line (Context * c);
-extern void vt102_cursor_retreat_line (Context * c);
-extern void vt102_do_pending_wrap (Context * c);
-extern void vt102_cursor_advance (Context * c);
-extern void vt102_cursor_retreat (VT102 * v);
-extern void vt102_reset_tabs (VT102 * v);
-extern void vt102_cursor_advance_tab (VT102 * v);
-extern void vt102_cursor_retreat_tab (VT102 * v);
-extern int vt102_cursor_home (VT102 * v);
-extern int vt102_cursor_absolute (VT102 * v, int x, int y);
-extern int vt102_cursor_relative (VT102 * v, int x, int y);
-extern void vt102_delete_from_line (VT102 * v, CRT_Pos p);
-extern void vt102_insert_into_line (VT102 * v, CRT_Pos p);
-extern void vt102_change_mode (Context * c, int private, char *ns, int set);
-extern void vt102_parse_mode_string (Context * c, char *buf, int len);
-extern void vt102_change_attr (VT102 * v, char *na);
-extern void vt102_parse_attr_string (VT102 * v, char *buf, int len);
-extern void vt102_save_state (VT102 * v);
-extern void vt102_restore_state (VT102 * v);
-extern void vt102_regular_char (Context * c, VT102 * v, uint32_t ch);
-extern int vt102_send_id (Context * c, char *buf);
-extern void vt102_scs (Context * c, int g, int s);
-extern void vt102_parse_csi (Context * c, char *buf, int len);
-extern void vt102_parse_esc (Context * c);
-extern void vt102_status_line (VT102 * v, char *str);
-extern void vt102_parser_reset (VT102_parser * p);
-extern void vt102_reset_state (Context * c);
-extern int vt102_rx_hook (Context * c, int ch);
-extern int vt102_parse_char (Context * c, int ch);
-extern void vt102_send (Context * c, uint8_t key);
-extern void vt102_reset (Context * c);
-extern VT102 *vt102_new (CRT_Pos * size);
-extern void vt102_set_ansi (VT102 * v, int ansi);
-extern void vt102_resize (Context * c, CRT_Pos size);
-extern void vt102_free (VT102 * v);
+extern void vt102_crt_update(Context *c);
+extern void vt102_do_resize(Context *c);
+extern void vt102_log_line(Context *c, int line);
+extern void vt102_history(Context *c, CRT_Pos t, CRT_Pos b);
+extern void vt102_clip_cursor(VT102 *v, CRT_Pos tl, CRT_Pos br);
+extern void vt102_cursor_normalize(VT102 *v);
+extern void vt102_cursor_carriage_return(VT102 *v);
+extern void vt102_cursor_advance_line(Context *c);
+extern void vt102_cursor_retreat_line(Context *c);
+extern void vt102_do_pending_wrap(Context *c);
+extern void vt102_cursor_advance(Context *c);
+extern void vt102_cursor_retreat(VT102 *v);
+extern void vt102_reset_tabs(VT102 *v);
+extern void vt102_cursor_advance_tab(VT102 *v);
+extern void vt102_cursor_retreat_tab(VT102 *v);
+extern int vt102_cursor_home(VT102 *v);
+extern int vt102_cursor_absolute(VT102 *v, int x, int y);
+extern int vt102_cursor_relative(VT102 *v, int x, int y);
+extern void vt102_delete_from_line(VT102 *v, CRT_Pos p);
+extern void vt102_insert_into_line(VT102 *v, CRT_Pos p);
+extern void vt102_change_mode(Context *c, int private, char *ns, int set);
+extern void vt102_parse_mode_string(Context *c, char *buf, int len);
+extern void vt102_change_attr(VT102 *v, char *na);
+extern void vt102_parse_attr_string(VT102 *v, char *buf, int len);
+extern void vt102_save_state(VT102 *v);
+extern void vt102_restore_state(VT102 *v);
+extern void vt102_regular_char(Context *c, VT102 *v, uint32_t ch);
+extern int vt102_send_id(Context *c, char *buf);
+extern void vt102_scs(Context *c, int g, int s);
+extern void vt102_status_line(VT102 *v, char *str);
+extern void vt102_parser_reset(VT102_parser *p);
+extern void vt102_reset_state(Context *c);
+extern int vt102_rx_hook(Context *c, int ch);
+extern int vt102_parse_char(Context *c, int ch);
+extern void vt102_send(Context *c, uint8_t key);
+extern void vt102_reset(Context *c);
+extern VT102 *vt102_new(CRT_Pos *size);
+extern void vt102_set_ansi(VT102 *v, int ansi);
+extern void vt102_resize(Context *c, CRT_Pos size);
+extern void vt102_free(VT102 *v);
 /* tty.c */
-extern void tty_pre_select (TTY * t, fd_set * rfds, fd_set * wfds);
-extern int tty_get_status (TTY * t, TTY_Status * s);
-extern int tty_get_baud (TTY * t);
-extern void tty_set_baud (TTY * t, int rate);
-extern void tty_send_break (TTY * t);
-extern void tty_set_flow (TTY * t, int flow);
-extern void tty_hangup (TTY * t);
-extern void tty_length (TTY * t, int l);
-extern void tty_winch (TTY * t, CRT_Pos size);
-extern void tty_parse_reset (Context * c);
-extern void tty_analyse (Context * c);
-extern TTY_Parser *tty_parser_new (void);
-extern int tty_parse (Context * c, uint8_t * buf, int len);
+extern void tty_pre_select(TTY *t, fd_set *rfds, fd_set *wfds);
+extern int tty_get_status(TTY *t, TTY_Status *s);
+extern int tty_get_baud(TTY *t);
+extern void tty_set_baud(TTY *t, int rate);
+extern void tty_send_break(TTY *t);
+extern void tty_set_flow(TTY *t, int flow);
+extern void tty_hangup(TTY *t);
+extern void tty_length(TTY *t, int l);
+extern void tty_winch(TTY *t, CRT_Pos size);
+extern void tty_parse_reset(Context *c);
+extern void tty_analyse(Context *c);
+extern TTY_Parser *tty_parser_new(void);
+extern int tty_parse(Context *c, uint8_t *buf, int len);
 /* keydis.c */
-extern KeyDis *keydis_vt102_new (void);
-extern KeyDis *keydis_ipc_new (Socket * s);
+extern KeyDis *keydis_vt102_new(void);
+extern KeyDis *keydis_ipc_new(Socket *s);
 /* history.c */
-extern History *history_new (int n);
-extern void history_free (History * h);
-extern void history_add (History * h, CRT_CA * c);
+extern History *history_new(int n);
+extern void history_free(History *h);
+extern void history_add(History *h, CRT_CA *c);
 /* ring.c */
-extern int ring_read (Ring * r, void *b, int n);
-extern int ring_write (Ring * r, void *b, int n);
-extern int ring_space (Ring * r);
-extern int ring_bytes (Ring * r);
-extern Ring *ring_new (int n);
+extern int ring_read(Ring *r, void *b, int n);
+extern int ring_write(Ring *r, void *b, int n);
+extern int ring_space(Ring *r);
+extern int ring_bytes(Ring *r);
+extern Ring *ring_new(int n);
 /* ptty.c */
-extern TTY *ptty_open (char *path, char *argv[], CRT_Pos * size);
+extern TTY *ptty_open(char *path, char *argv[], CRT_Pos *size);
 /* terminal.c */
 extern int terminal_winches;
-extern void terminal_atexit (void);
-extern void terminal_getsize (TTY * _t);
-extern void terminal_dispatch (void);
-extern void terminal_register_handlers (void);
-extern TTY *terminal_open (int rfd, int wfd);
+extern void terminal_atexit(void);
+extern void terminal_getsize(TTY *_t);
+extern void terminal_dispatch(void);
+extern void terminal_register_handlers(void);
+extern TTY *terminal_open(int rfd, int wfd);
 /* util.c */
-extern int wrap_read (int fd, void *buf, int len);
-extern int wrap_write (int fd, void *buf, int len);
-extern void set_nonblocking (int fd);
-extern void set_blocking (int fd);
-extern void default_termios (struct termios *termios);
-extern void client_termios (struct termios *termios);
-extern int fput_cp (FILE * f, uint32_t ch);
+extern int wrap_read(int fd, void *buf, int len);
+extern int wrap_write(int fd, void *buf, int len);
+extern void set_nonblocking(int fd);
+extern void set_blocking(int fd);
+extern void default_termios(struct termios *termios);
+extern void client_termios(struct termios *termios);
+extern int fput_cp(FILE *f, uint32_t ch);
 /* log.c */
-extern Log *file_log_new (char *fn, int rotate);
-extern void log_f (Log * log, char *fmt, ...);
+extern Log *file_log_new(char *fn, int rotate);
+extern void log_f(Log *log, char *fmt, ...);
 /* ipc.c */
-extern IPC_Msg *ipc_check_for_message_in_slide (Slide * s);
-extern void ipc_consume_message_in_slide (Slide * s);
-extern int ipc_msg_send (Socket * s, IPC_Msg * m);
-extern int ipc_msg_send_debug (Socket * s, char *msg);
-extern int ipc_msg_send_history (Socket * s, History_ent * l);
-extern int ipc_msg_send_vt102 (Socket * s, VT102 * v);
-extern int ipc_msg_send_key (Socket * s, int key);
-extern int ipc_msg_send_term (Socket * s, void *buf, int len);
-extern int ipc_msg_send_status (Socket * s, char *buf);
-extern int ipc_msg_send_setbaud (Socket * s, int baud);
-extern int ipc_msg_send_sendbreak (Socket * s);
-extern int ipc_msg_send_setflow (Socket * s, int flow);
-extern int ipc_msg_send_setansi (Socket * s, int ansi);
-extern int ipc_msg_send_hangup (Socket * s);
-extern int ipc_msg_send_setsize (Socket * s, CRT_Pos size);
-extern int ipc_msg_send_reset (Socket * s);
-extern void ipc_execute_message (IPC_Msg * m, Context * c);
+extern IPC_Msg *ipc_check_for_message_in_slide(Slide *s);
+extern void ipc_consume_message_in_slide(Slide *s);
+extern int ipc_msg_send(Socket *s, IPC_Msg *m);
+extern int ipc_msg_send_debug(Socket *s, char *msg);
+extern int ipc_msg_send_history(Socket *s, History_ent *l);
+extern int ipc_msg_send_vt102(Socket *s, VT102 *v);
+extern int ipc_msg_send_key(Socket *s, int key);
+extern int ipc_msg_send_term(Socket *s, void *buf, int len);
+extern int ipc_msg_send_status(Socket *s, char *buf);
+extern int ipc_msg_send_setbaud(Socket *s, int baud);
+extern int ipc_msg_send_sendbreak(Socket *s);
+extern int ipc_msg_send_setflow(Socket *s, int flow);
+extern int ipc_msg_send_setansi(Socket *s, int ansi);
+extern int ipc_msg_send_hangup(Socket *s);
+extern int ipc_msg_send_setsize(Socket *s, CRT_Pos size);
+extern int ipc_msg_send_reset(Socket *s);
+extern void ipc_execute_message(IPC_Msg *m, Context *c);
 /* slide.c */
-extern void slide_free (Slide * s);
-extern void slide_consume (Slide * s, int n);
-extern void slide_added (Slide * s, int n);
-extern Slide *slide_new (int n);
-extern void slide_expand (Slide * s, int n);
+extern void slide_free(Slide *s);
+extern void slide_consume(Slide *s, int n);
+extern void slide_added(Slide *s, int n);
+extern Slide *slide_new(int n);
+extern void slide_expand(Slide *s, int n);
 /* symsocket.c */
-extern int wrap_recv (int fd, void *buf, int len);
-extern int wrap_send (int fd, void *buf, int len);
-extern void socket_free (Socket * s);
-extern void socket_free_parent (Socket * s);
-extern Socket *socket_listen (char *path);
-extern Socket *socket_accept (Socket * l);
-extern Socket *socket_connect (char *path);
-extern void socket_consume_msg (Socket * s);
-extern void socket_pre_select (Socket * s, fd_set * rfds, fd_set * wfds);
-extern int socket_post_select (Socket * s, fd_set * rfds, fd_set * wfds);
-extern int socket_write (Socket * s, void *buf, int len);
-extern void socket_execute_msg (Socket * s, Context * ctx);
+extern int wrap_recv(int fd, void *buf, int len);
+extern int wrap_send(int fd, void *buf, int len);
+extern void socket_free(Socket *s);
+extern void socket_free_parent(Socket *s);
+extern Socket *socket_listen(char *path);
+extern Socket *socket_accept(Socket *l);
+extern Socket *socket_connect(char *path);
+extern void socket_consume_msg(Socket *s);
+extern void socket_pre_select(Socket *s, fd_set *rfds, fd_set *wfds);
+extern int socket_post_select(Socket *s, fd_set *rfds, fd_set *wfds);
+extern int socket_write(Socket *s, void *buf, int len);
+extern void socket_execute_msg(Socket *s, Context *ctx);
 /* serial.c */
-extern TTY *serial_open (char *path, int lock_mode);
+extern TTY *serial_open(char *path, int lock_mode);
 /* cmd.c */
-extern int cmd_parse (Cmd * c, Context * ctx, ANSI * a, char *buf);
-extern void cmd_show_status (Cmd * c, Context * ctx);
-extern int cmd_key (Cmd * c, Context * ctx, ANSI * a, int key);
-extern int cmd_deactivate (Cmd * c, Context * ctx);
-extern int cmd_activate (Cmd * c, Context * ctx);
-extern void cmd_new_status (Cmd * c, Context * ctx, char *msg);
-extern Cmd *cmd_new (void);
+extern int cmd_parse(Cmd *c, Context *ctx, ANSI *a, char *buf);
+extern void cmd_show_status(Cmd *c, Context *ctx);
+extern int cmd_key(Cmd *c, Context *ctx, ANSI *a, int key);
+extern int cmd_deactivate(Cmd *c, Context *ctx);
+extern int cmd_activate(Cmd *c, Context *ctx);
+extern void cmd_new_status(Cmd *c, Context *ctx, char *msg);
+extern Cmd *cmd_new(void);
 /* lockfile.c */
-extern Filelist *filelist_new (void);
-extern void filelist_remove (Filelist * fl, Filelist_ent * fle);
-extern void filelist_add (Filelist * fl, char *fn);
-extern void filelist_free (Filelist * fl);
-extern void filelist_print (Filelist * fl, FILE * f);
-extern int lockfile_make (char *name);
-extern void lockfile_add_places (Filelist * fl, char *leaf);
-extern void lockfile_regularize_and_add (Filelist * fl, char *leaf);
-extern void lockfile_add_name_from_path (Filelist * fl, char *file);
-extern void lockfile_add_name_from_dev (Filelist * fl, dev_t dev);
-extern void lockfile_check_dir_for_dev (Filelist * fl, char *dir, dev_t dev);
-extern Filelist *lockfile_make_list (char *device);
-extern void lockfile_remove_stale (Filelist * fl);
-extern Filelist *lockfile_lock (Filelist * fl);
-extern void lockfile_unlock (Filelist * fl);
-extern int serial_lock_check (Serial_lock * l);
-extern void serial_lock_free (Serial_lock * l);
-extern Serial_lock *serial_lock_new (char *dev, int mode);
+extern Filelist *filelist_new(void);
+extern void filelist_remove(Filelist *fl, Filelist_ent *fle);
+extern void filelist_add(Filelist *fl, char *fn);
+extern void filelist_free(Filelist *fl);
+extern void filelist_print(Filelist *fl, FILE *f);
+extern int lockfile_make(char *name);
+extern void lockfile_add_places(Filelist *fl, char *leaf);
+extern void lockfile_regularize_and_add(Filelist *fl, char *leaf);
+extern void lockfile_add_name_from_path(Filelist *fl, char *file);
+extern void lockfile_add_name_from_dev(Filelist *fl, dev_t dev);
+extern void lockfile_check_dir_for_dev(Filelist *fl, char *dir, dev_t dev);
+extern Filelist *lockfile_make_list(char *device);
+extern void lockfile_remove_stale(Filelist *fl);
+extern Filelist *lockfile_lock(Filelist *fl);
+extern void lockfile_unlock(Filelist *fl);
+extern int serial_lock_check(Serial_lock *l);
+extern void serial_lock_free(Serial_lock *l);
+extern Serial_lock *serial_lock_new(char *dev, int mode);
 /* utf8.c */
-extern int utf8_flush (Context * c);
-extern int utf8_parse (Context * c, uint32_t ch);
-extern UTF8 *utf8_new (void);
-extern int utf8_encode (char *ptr, int ch);
-extern int utf8_emit (TTY * t, int ch);
+extern int utf8_flush(Context *c);
+extern int utf8_parse(Context *c, uint32_t ch);
+extern UTF8 *utf8_new(void);
+extern int utf8_encode(char *ptr, int ch);
+extern int utf8_emit(TTY *t, int ch);
 /* vt102_charset.c */
 extern uint32_t vt102_charset_c0[128];
 extern uint32_t vt102_charset_us[128];
@@ -188,10 +183,10 @@ extern uint32_t vt102_charset_vt52[128];
 extern uint32_t vt102_charset_gl[128];
 extern uint32_t *charset_from_csid[];
 /* rotate.c */
-extern void rotate_gzip (char *file);
-extern void rotate (char *file);
-extern int rotate_check (char *file);
+extern void rotate_gzip(char *file);
+extern void rotate(char *file);
+extern int rotate_check(char *file);
 /* raw.c */
-extern RX *rx_new_raw (int rfd, int wfd);
-extern TTY *terminal_new_raw (int rfd, int wfd);
-extern ANSI *ansi_new_raw (int rfd, int wfd);
+extern RX *rx_new_raw(int rfd, int wfd);
+extern TTY *terminal_new_raw(int rfd, int wfd);
+extern ANSI *ansi_new_raw(int rfd, int wfd);
diff --git a/src/raw.c b/src/raw.c
index df54ced..a7f01cd 100644
--- a/src/raw.c
+++ b/src/raw.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.3  2008/03/06 17:21:41  james
+ * *** empty log message ***
+ *
  * Revision 1.2  2008/03/06 16:49:39  james
  * *** empty log message ***
  *
@@ -28,12 +31,21 @@ typedef struct
   int wfd;
 } RX_Raw;
 
+typedef struct 
+{
+  TTY_SIGNATURE;
+} RAW_TERMINAL;
+
+
 static int
 rx_raw_rx (RX * _r, int ch)
 {
   RX_Raw *r = (RX_Raw *) _r;
+  int ret;
   uint8_t c = ch;
-  return (write (r->wfd, &c, 1) == 1) ? 0 : -1;
+  printf("RX RAW %d\n",ch);
+  set_blocking(r->wfd);
+  ret=(write (r->wfd, &c, 1) == 1) ? 0 : -1;
 }
 
 static void
@@ -60,12 +72,95 @@ rx_new_raw (int rfd, int wfd)
 }
 
 
+static int
+raw_terminal_read (TTY * _t, void *buf, int len)
+{
+  RAW_TERMINAL *t = (RAW_TERMINAL *) _t;
+  int red, done = 0;
+
+  set_nonblocking (t->rfd);
+
+  do
+    {
+
+      red = wrap_read (t->rfd, buf, len);
+      if (red < 0)
+        return -1;
+      if (!red)
+        return done;
+
+      buf += red;
+      len -= red;
+      done += red;
+    }
+  while (len);
+
+
+  return done;
+}
+
+
+static int
+raw_terminal_write (TTY * _t, void *buf, int len)
+{
+  int writ, done = 0;
+  RAW_TERMINAL *t = (RAW_TERMINAL *) _t;
+
+  set_blocking (t->wfd);
+
+  do
+    {
+
+      writ = wrap_write (t->wfd, buf, len);
+      if (writ < 0)
+        return -1;
+
+      if (!writ)
+        usleep (1000);
+
+      buf += writ;
+      len -= writ;
+      done += writ;
+    }
+  while (len);
+
+
+  return done;
+}
+
+
+
+static void raw_terminal_close(TTY *_t)
+{
+RAW_TERMINAL *t=(RAW_TERMINAL *)_t;
+  set_blocking (t->rfd);
+  set_blocking (t->wfd);
+
+free(t);
+}
+
 
 TTY *
 terminal_new_raw (int rfd, int wfd)
 {
-//FIXME
-  return NULL;
+  RAW_TERMINAL *t;
+
+  t = (RAW_TERMINAL *) malloc (sizeof (RAW_TERMINAL));
+  memset(t,0,sizeof(t));
+
+  strcpy (t->name, "raw");
+  t->rfd = rfd;
+  t->wfd = wfd;
+
+  set_nonblocking (rfd);
+  set_nonblocking (wfd);
+
+  t->recv = raw_terminal_read;
+//  t->xmit = raw_terminal_write;
+  t->close = raw_terminal_close;
+  t->blocked = 0;
+
+  return (TTY *) t;
 }
 
 static void
@@ -73,7 +168,34 @@ ansi_raw_one_shot (ANSI * a, CRT * c)
 {
 }
 
+static int ansi_raw_key(ANSI *a,Context *c,int key)
+{
+return c->k->key (c->k, c, key);
+}
+
+static void ansi_raw_parse(ANSI *a,Context *c,uint8_t *buf,int red)
+{
+while (red--) 
+ansi_raw_key(a,c,*(buf++));
+}
+
+static int
+ansi_raw_dispatch (ANSI * a, Context * c)
+{
+  char buf[1024];
+  int red;
+
+  if (!a->terminal)
+    return 0;
 
+  red = a->terminal->recv (a->terminal, buf, sizeof (buf));
+  if (red <= 0)
+    return red;
+
+  ansi_raw_parse (a, c, buf, red);
+
+  return 0;
+}
 static void
 ansi_raw_free (ANSI * a)
 {
@@ -89,6 +211,7 @@ ansi_new_raw (int rfd, int wfd)
   memset (ret, 0, sizeof (ANSI));
 
   ret->terminal = terminal_new_raw (rfd, wfd);
+  ret->dispatch=ansi_raw_dispatch;
   ret->close = ansi_raw_free;
 
   return ret;
diff --git a/src/vt102.c b/src/vt102.c
index 4ca4578..cdbb236 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
+ * Revision 1.61  2008/03/06 17:21:41  james
+ * *** empty log message ***
+ *
  * Revision 1.60  2008/03/06 16:49:39  james
  * *** empty log message ***
  *
@@ -1143,13 +1146,14 @@ vt102_scs (Context * c, int g, int s)
 
 }
 
-void
+static int
 vt102_parse_csi (Context * c, char *buf, int len)
 {
   char last;
   char *ptr;
   char *arg = buf + 1;
   int narg;
+  int err=0;
 
   VT102 *v = c->v;
 
@@ -1322,8 +1326,10 @@ vt102_parse_csi (Context * c, char *buf, int len)
           vt102_cursor_absolute (v, narg - 1, v->pos.y);
           break;
         case 'b':
-          while (narg--)
+          while (narg--) {
             vt102_regular_char (c, v, v->last_reg_char);
+   	     err += vt102_rx_hook (c, v->last_reg_char);
+	}
           break;
         case 'c':
           /* For some obscure reason some programs seem to send */
@@ -1436,11 +1442,13 @@ vt102_parse_csi (Context * c, char *buf, int len)
 
 
 
+return err;
 }
 
-void
+static int 
 vt102_parse_esc (Context * c)
 {
+  int err=0;
   VT102 *v = c->v;
   VT102_parser *p = &v->parser;
 
@@ -1600,7 +1608,7 @@ vt102_parse_esc (Context * c)
       //FIXME:
       break;
     case '[':
-      vt102_parse_csi (c, p->cmd_buf, p->cmd_ptr);
+      err+=vt102_parse_csi (c, p->cmd_buf, p->cmd_ptr);
       break;
     case '(':                  /*Charsets */
     case ')':
@@ -1621,6 +1629,7 @@ vt102_parse_esc (Context * c)
   log_f (c->l, "<cmd out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,
          v->pending_wrap);
 #endif
+return err;
 }
 
 void
@@ -1789,7 +1798,7 @@ vt102_parse_char (Context * c, int ch)
 
       if (!p->in_cmd)
         {
-          vt102_parse_esc (c);
+          err+=vt102_parse_esc (c);
           p->cmd_more_bytes = 0;
           p->cmd_termination = 0;
         }
@@ -1803,7 +1812,7 @@ vt102_parse_char (Context * c, int ch)
       pre_parse_cmd (ch, p);
 
       if (!p->in_cmd)
-        vt102_parse_esc (c);
+        err+=vt102_parse_esc (c);
     }
   else if (ch == 0x9b)
     {                           /*One byte CSI */
@@ -1897,7 +1906,7 @@ vt102_parse_char (Context * c, int ch)
 #endif
         /*regular character */ default:
           vt102_regular_char (c, v, ch);
-          err += vt102_rx_hook (c, ch);
+   		err += vt102_rx_hook (c, ch);
         }
 
 #ifdef DEBUG