From 3aaa25a4e02ff362ef6b057c597630bdbef5227b Mon Sep 17 00:00:00 2001 From: james <> Date: Thu, 6 Mar 2008 21:34:09 +0000 Subject: *** empty log message *** --- apps/mainloop.c | 10 +- apps/sympathy.c | 27 +++-- apps/usage.c | 7 +- configure.in | 5 +- src/ansi.c | 27 +++-- src/ansi.h | 5 +- src/prototypes.h | 317 ++++++++++++++++++++++++++++--------------------------- src/raw.c | 32 +++--- src/vt102.c | 30 +++--- 9 files changed, 249 insertions(+), 211 deletions(-) diff --git a/apps/mainloop.c b/apps/mainloop.c index 19c5759..a3697f3 100644 --- a/apps/mainloop.c +++ b/apps/mainloop.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.26 2008/03/06 21:34:09 james + * *** empty log message *** + * * Revision 1.25 2008/03/06 21:33:02 james * *** empty log message *** * @@ -551,18 +554,19 @@ mainloop (Context * c, ANSI * ansi, Socket * server_socket, /*any data from the server */ if (client_socket) { - int err=0; + int err = 0; if (socket_post_select (client_socket, &rfds, &wfds)) break; while (client_socket->msg && !err) { - err+=msg_from_server (ansi, client_socket->msg, c); + err += msg_from_server (ansi, client_socket->msg, c); socket_consume_msg (client_socket); } - if (err) break; + if (err) + break; } diff --git a/apps/sympathy.c b/apps/sympathy.c index 2a9b314..357f1df 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.36 2008/03/06 21:34:09 james + * *** empty log message *** + * * Revision 1.35 2008/03/06 21:33:02 james * *** empty log message *** * @@ -279,7 +282,7 @@ mome (char *fmt, ...) Socket * -find_socket (char **retpath,char *fmt, ...) +find_socket (char **retpath, char *fmt, ...) { Socket *ret; char *path, *leaf, *h, **ptr; @@ -322,11 +325,14 @@ find_socket (char **retpath,char *fmt, ...) if (ret) { - if (retpath) { - *retpath=path; - } else { - free (path); - } + if (retpath) + { + *retpath = path; + } + else + { + free (path); + } free (leaf); return ret; } @@ -795,11 +801,12 @@ main (int argc, char *argv[]) if (safe_atoi (id) > 0) { - client_socket = find_socket (&oargs['k'],"%s%d", hostname, safe_atoi (id)); + client_socket = + find_socket (&oargs['k'], "%s%d", hostname, safe_atoi (id)); } else { - client_socket = find_socket (&oargs['k'],"%s", id); + client_socket = find_socket (&oargs['k'], "%s", id); } if (!client_socket) @@ -834,8 +841,8 @@ main (int argc, char *argv[]) ansi_new_from_terminal (terminal_open (0, 1), oflags['u'] ? 0 : 1); ansi->reset (ansi, NULL); - if (ansi->set_title) - ansi->set_title(ansi,oargs['k']); + if (ansi->set_title) + ansi->set_title (ansi, oargs['k']); } if (oflags['I']) { diff --git a/apps/usage.c b/apps/usage.c index b0a91d4..abad505 100644 --- a/apps/usage.c +++ b/apps/usage.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.21 2008/03/06 21:34:09 james + * *** empty log message *** + * * Revision 1.20 2008/03/06 17:21:41 james * *** empty log message *** * @@ -135,10 +138,10 @@ usage (void) " -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. 0terminal->xmit(a->terminal,buf,i)!=i) return 1; -return 0; + if (a->terminal->xmit (a->terminal, buf, i) != i) + return 1; + return 0; } static int @@ -1035,7 +1042,7 @@ ansi_new_from_terminal (TTY * t, int utf8) ret->update = ansi_update; ret->reset = ansi_reset; ret->terminal_reset = ansi_terminal_reset; - ret->set_title=ansi_set_title; + ret->set_title = ansi_set_title; ret->close = ansi_free; ret->dispatch = ansi_dispatch; diff --git a/src/ansi.h b/src/ansi.h index d795fdc..beb0baa 100644 --- a/src/ansi.h +++ b/src/ansi.h @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.18 2008/03/06 21:34:09 james + * *** empty log message *** + * * Revision 1.17 2008/03/06 21:33:02 james * *** empty log message *** * @@ -108,7 +111,7 @@ typedef struct ANSI_struct int (*update) (struct ANSI_struct *, struct Context_struct *); int (*one_shot) (struct ANSI_struct *, struct CRT_struct *); int (*reset) (struct ANSI_struct *, struct CRT_struct *); - int (*set_title) (struct ANSI_struct *,char *); + int (*set_title) (struct ANSI_struct *, char *); void (*terminal_reset) (struct ANSI_struct *); void (*close) (struct ANSI_struct *); } ANSI; diff --git a/src/prototypes.h b/src/prototypes.h index 26b0903..dd7cdfe 100644 --- a/src/prototypes.h +++ b/src/prototypes.h @@ -1,180 +1,181 @@ /* ansi.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_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]; @@ -183,10 +184,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 2bfc977..7116c97 100644 --- a/src/raw.c +++ b/src/raw.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.5 2008/03/06 21:34:09 james + * *** empty log message *** + * * Revision 1.4 2008/03/06 21:33:02 james * *** empty log message *** * @@ -34,7 +37,7 @@ typedef struct int wfd; } RX_Raw; -typedef struct +typedef struct { TTY_SIGNATURE; } RAW_TERMINAL; @@ -46,8 +49,8 @@ rx_raw_rx (RX * _r, int ch) RX_Raw *r = (RX_Raw *) _r; int ret; uint8_t c = ch; - set_blocking(r->wfd); - ret=(write (r->wfd, &c, 1) == 1) ? 0 : -1; + set_blocking (r->wfd); + ret = (write (r->wfd, &c, 1) == 1) ? 0 : -1; } static void @@ -132,13 +135,14 @@ raw_terminal_write (TTY * _t, void *buf, int len) -static void raw_terminal_close(TTY *_t) +static void +raw_terminal_close (TTY * _t) { -RAW_TERMINAL *t=(RAW_TERMINAL *)_t; + RAW_TERMINAL *t = (RAW_TERMINAL *) _t; set_blocking (t->rfd); set_blocking (t->wfd); -free(t); + free (t); } @@ -148,7 +152,7 @@ terminal_new_raw (int rfd, int wfd) RAW_TERMINAL *t; t = (RAW_TERMINAL *) malloc (sizeof (RAW_TERMINAL)); - memset(t,0,sizeof(t)); + memset (t, 0, sizeof (t)); strcpy (t->name, "raw"); t->rfd = rfd; @@ -170,15 +174,17 @@ ansi_raw_one_shot (ANSI * a, CRT * c) { } -static int ansi_raw_key(ANSI *a,Context *c,int key) +static int +ansi_raw_key (ANSI * a, Context * c, int key) { -return c->k->key (c->k, c, key); + return c->k->key (c->k, c, key); } -static void ansi_raw_parse(ANSI *a,Context *c,uint8_t *buf,int red) +static void +ansi_raw_parse (ANSI * a, Context * c, uint8_t * buf, int red) { -while (red--) -ansi_raw_key(a,c,*(buf++)); + while (red--) + ansi_raw_key (a, c, *(buf++)); } static int @@ -213,7 +219,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->dispatch = ansi_raw_dispatch; ret->close = ansi_raw_free; return ret; diff --git a/src/vt102.c b/src/vt102.c index cdbb236..7ab2d90 100644 --- a/src/vt102.c +++ b/src/vt102.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.62 2008/03/06 21:34:09 james + * *** empty log message *** + * * Revision 1.61 2008/03/06 17:21:41 james * *** empty log message *** * @@ -1153,7 +1156,7 @@ vt102_parse_csi (Context * c, char *buf, int len) char *ptr; char *arg = buf + 1; int narg; - int err=0; + int err = 0; VT102 *v = c->v; @@ -1326,10 +1329,11 @@ vt102_parse_csi (Context * c, char *buf, int len) vt102_cursor_absolute (v, narg - 1, v->pos.y); break; case 'b': - while (narg--) { - vt102_regular_char (c, v, v->last_reg_char); - err += vt102_rx_hook (c, v->last_reg_char); - } + 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 */ @@ -1442,13 +1446,13 @@ vt102_parse_csi (Context * c, char *buf, int len) -return err; + return err; } -static int +static int vt102_parse_esc (Context * c) { - int err=0; + int err = 0; VT102 *v = c->v; VT102_parser *p = &v->parser; @@ -1608,7 +1612,7 @@ vt102_parse_esc (Context * c) //FIXME: break; case '[': - err+=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 ')': @@ -1629,7 +1633,7 @@ vt102_parse_esc (Context * c) log_f (c->l, "", v->pos.x, v->pos.y, v->pending_wrap); #endif -return err; + return err; } void @@ -1798,7 +1802,7 @@ vt102_parse_char (Context * c, int ch) if (!p->in_cmd) { - err+=vt102_parse_esc (c); + err += vt102_parse_esc (c); p->cmd_more_bytes = 0; p->cmd_termination = 0; } @@ -1812,7 +1816,7 @@ vt102_parse_char (Context * c, int ch) pre_parse_cmd (ch, p); if (!p->in_cmd) - err+=vt102_parse_esc (c); + err += vt102_parse_esc (c); } else if (ch == 0x9b) { /*One byte CSI */ @@ -1906,7 +1910,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 -- cgit v1.2.3