aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <>2008-03-06 16:49:39 +0000
committerjames <>2008-03-06 16:49:39 +0000
commit6fb644311ee9bf169a12bb9b2d9b081c16fc08f0 (patch)
treef24e108907526e917d0829078ec8e0e25338baaa
parentd7565f9da9ada7a0aa90abdb6d8d1ba192075791 (diff)
downloadsympathy-6fb644311ee9bf169a12bb9b2d9b081c16fc08f0.tar.gz
sympathy-6fb644311ee9bf169a12bb9b2d9b081c16fc08f0.tar.bz2
sympathy-6fb644311ee9bf169a12bb9b2d9b081c16fc08f0.zip
*** empty log message ***
-rw-r--r--apps/mainloop.c20
-rw-r--r--apps/mainloop.h5
-rw-r--r--apps/sympathy.c32
-rw-r--r--src/html.c5
-rw-r--r--src/keys.h169
-rw-r--r--src/prototypes.h325
-rw-r--r--src/raw.c50
-rw-r--r--src/rx.h7
-rw-r--r--src/tty.c17
-rw-r--r--src/utf8.c29
-rw-r--r--src/vt102.c32
11 files changed, 367 insertions, 324 deletions
diff --git a/apps/mainloop.c b/apps/mainloop.c
index 5772214..e266179 100644
--- a/apps/mainloop.c
+++ b/apps/mainloop.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.24 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.23 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -380,7 +383,7 @@ check_status (Context * c, Clients * cs)
static int
msg_from_server (ANSI * a, IPC_Msg * m, Context * c)
{
-int err=0;
+ int err = 0;
switch (m->hdr.type)
{
@@ -401,11 +404,11 @@ int err=0;
if (a->one_shot)
{
a->one_shot (a, &c->v->crt);
- err++;/*Simulate a fatal write error enclosing tty*/
+ err++; /*Simulate a fatal write error enclosing tty */
}
break;
case IPC_MSG_TYPE_TERM:
- err+=tty_parse (c, m->term.term, m->term.len);
+ err += tty_parse (c, m->term.term, m->term.len);
break;
case IPC_MSG_TYPE_STATUS:
cmd_new_status (c->d, c, m->status.status);
@@ -418,7 +421,8 @@ int err=0;
void
-mainloop ( Context *c, ANSI *ansi,Socket * server_socket, Socket * client_socket)
+mainloop (Context * c, ANSI * ansi, Socket * server_socket,
+ Socket * client_socket)
{
fd_set rfds, wfds;
Clients *clients;
@@ -535,7 +539,7 @@ mainloop ( Context *c, ANSI *ansi,Socket * server_socket, Socket * client_socket
if (clients)
send_output (clients, buf, red);
if (tty_parse (c, buf, red))
- break;
+ break;
}
}
@@ -550,7 +554,7 @@ mainloop ( Context *c, ANSI *ansi,Socket * server_socket, Socket * client_socket
while (client_socket->msg)
{
if (msg_from_server (ansi, client_socket->msg, c))
- break;
+ break;
socket_consume_msg (client_socket);
}
@@ -562,11 +566,11 @@ mainloop ( Context *c, ANSI *ansi,Socket * server_socket, Socket * client_socket
{
if (ansi->dispatch)
if (ansi->dispatch (ansi, c))
- break;
+ break;
if (ansi->update)
if (ansi->update (ansi, c))
- break;
+ break;
}
}
diff --git a/apps/mainloop.h b/apps/mainloop.h
index e85b784..2c7f2b9 100644
--- a/apps/mainloop.h
+++ b/apps/mainloop.h
@@ -12,6 +12,9 @@
/*
* $Log$
+ * Revision 1.9 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.8 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -43,5 +46,5 @@
#include <sympathy.h>
-extern void mainloop (Context *,ANSI *a,Socket *,Socket *);
+extern void mainloop (Context *, ANSI * a, Socket *, Socket *);
#endif /* __MAINLOOP_H__ */
diff --git a/apps/sympathy.c b/apps/sympathy.c
index dc9dd66..33c47e7 100644
--- a/apps/sympathy.c
+++ b/apps/sympathy.c
@@ -11,6 +11,9 @@ static char rcsid[] =
/*
* $Log$
+ * Revision 1.34 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.33 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -436,13 +439,13 @@ get_hostname (void)
int
main (int argc, char *argv[])
{
- Context ctx_store={0},*ctx=&ctx_store;
+ Context ctx_store = { 0 }, *ctx = &ctx_store;
int c;
extern char *optarg;
extern int optind, opterr, optopt;
CRT_Pos size = { VT102_COLS_80, VT102_ROWS_24 };
- ANSI *ansi=NULL;
+ ANSI *ansi = NULL;
int csnok_pipe[2] = { 0 };
int csnok = 0;
@@ -551,7 +554,7 @@ main (int argc, char *argv[])
if (oflags['c'] && oflags['s'] && oflags['F'])
fatal_moan ("-F is incompatible with -c -s");
- if (oflags['H'] && oflags['N'])
+ if (oflags['H'] && oflags['N'])
fatal_moan ("-H is incompatible with -N");
/*implement server and client: this process forks. The parent */
@@ -620,8 +623,8 @@ main (int argc, char *argv[])
if (oflags['c'] && !oflags['k'] && !oflags['r'])
fatal_moan ("-c requires a socket to be specified with -s or -k or -r");
- if ((oflags['H'] || oflags['N'] || oflags['I'] ) && oflags['s'])
- fatal_moan("-s is incompatible with -H, -N and -I");
+ if ((oflags['H'] || oflags['N'] || oflags['I']) && oflags['s'])
+ fatal_moan ("-s is incompatible with -H, -N and -I");
if ((oflags['p'] || oflags['d'] || oflags['K'] || oflags['b'] || oflags['f']
|| oflags['L'] || oflags['R'] || oflags['P']) && oflags['c'])
@@ -806,10 +809,12 @@ main (int argc, char *argv[])
if (oflags['c'] || oflags['t'])
{
- if (oflags['N']) {
- ctx->r=rx_new_raw(0,1);
- ansi=ansi_new_raw(0,1);
- } else if (oflags['H'])
+ if (oflags['N'])
+ {
+ ctx->r = rx_new_raw (0, 1);
+ ansi = ansi_new_raw (0, 1);
+ }
+ else if (oflags['H'])
{
ansi = ansi_new_html (stdout);
}
@@ -821,16 +826,17 @@ main (int argc, char *argv[])
oflags['u'] ? 0 : 1);
ansi->reset (ansi, NULL);
}
- if (oflags['I']) {
- //FIXME ...
- }
+ if (oflags['I'])
+ {
+ //FIXME ...
+ }
}
ctx->v = vt102_new (&size);
ctx->h = history_new (history);
- mainloop (ctx,ansi, server_socket, client_socket);
+ mainloop (ctx, ansi, server_socket, client_socket);
// mainloop (tty, server_socket, client_socket, ansi, log, history, &size);
diff --git a/src/html.c b/src/html.c
index 3923856..e789d11 100644
--- a/src/html.c
+++ b/src/html.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.13 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.12 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -196,7 +199,7 @@ static int
html_one_shot (ANSI * a, CRT * c)
{
html_draw (a->file, c);
-return 0;
+ return 0;
}
diff --git a/src/keys.h b/src/keys.h
index 22418dc..0406ed8 100644
--- a/src/keys.h
+++ b/src/keys.h
@@ -12,6 +12,9 @@
/*
* $Log$
+ * Revision 1.7 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.6 2008/03/06 01:49:19 james
* *** empty log message ***
*
@@ -26,92 +29,92 @@
#ifndef __KEYS_H__
#define __KEYS_H__
-#define KEY_UP 128 /*A*/
-#define KEY_DOWN 129 /*B*/
-#define KEY_RIGHT 130 /*C*/
-#define KEY_LEFT 131 /*D*/
-#define KEY_MIDDLE 132 /*E*/
-#define KEY_END 133 /*F*/
-#define KEY_134 134 /*G*/
-#define KEY_HOME 135 /*H*/
-#define KEY_136 136 /*I*/
-#define KEY_137 137 /*J*/
-#define KEY_138 138 /*K*/
-#define KEY_139 139 /*L*/
-#define KEY_ENTER 140 /*M*/
-#define KEY_141 141 /*N*/
-#define KEY_142 142 /*O*/
+#define KEY_UP 128 /*A*/
+#define KEY_DOWN 129 /*B*/
+#define KEY_RIGHT 130 /*C*/
+#define KEY_LEFT 131 /*D*/
+#define KEY_MIDDLE 132 /*E*/
+#define KEY_END 133 /*F*/
+#define KEY_134 134 /*G*/
+#define KEY_HOME 135 /*H*/
+#define KEY_136 136 /*I*/
+#define KEY_137 137 /*J*/
+#define KEY_138 138 /*K*/
+#define KEY_139 139 /*L*/
+#define KEY_ENTER 140 /*M*/
+#define KEY_141 141 /*N*/
+#define KEY_142 142 /*O*/
#define KEY_PF1 143 /*P*/ /*Also F1 */
#define KEY_PF2 144 /*Q*/ /*Also F2 */
#define KEY_PF3 145 /*R*/ /*Also F3 */
#define KEY_PF4 146 /*S*/ /*Also F4 */
-#define KEY_147 147 /*T*/
-#define KEY_148 148 /*U*/
-#define KEY_149 149 /*V*/
-#define KEY_150 150 /*W*/
-#define KEY_151 151 /*X*/
-#define KEY_152 152 /*Y*/
-#define KEY_153 153 /*Z*/
-#define KEY_154 154 /*a */
-#define KEY_155 155 /*b */
-#define KEY_156 156 /*c */
-#define KEY_157 157 /*d */
-#define KEY_158 158 /*e */
-#define KEY_159 159 /*f */
-#define KEY_160 160 /*g */
-#define KEY_161 161 /*h */
-#define KEY_162 162 /*i */
-#define KEY_STAR 163 /*j */
-#define KEY_PLUS 164 /*k */
-#define KEY_COMMA 165 /*l */
-#define KEY_MINUS 166 /*m */
-#define KEY_PERIOD 167 /*n */
-#define KEY_DIVIDE 168 /*o */
-#define KEY_0 169 /*p */
-#define KEY_1 170 /*q */
-#define KEY_2 171 /*r */
-#define KEY_3 172 /*s */
-#define KEY_4 173 /*t */
-#define KEY_5 174 /*u */
-#define KEY_6 175 /*v */
-#define KEY_7 176 /*w */
-#define KEY_8 177 /*x */
-#define KEY_9 178 /*y */
-#define KEY_179 179 /*z */
-#define KEY_180 180 /*0 */
-#define KEY_VT220_HOME 181 /*1 */
-#define KEY_INSERT 182 /*2 */
-#define KEY_DELETE 183 /*3 */
-#define KEY_VT220_END 184 /*4 */
-#define KEY_PGUP 185 /*5 */
-#define KEY_PGDN 186 /*6 */
-#define KEY_187 187 /*7 */
-#define KEY_188 188 /*8 */
-#define KEY_189 189 /*9 */
-#define KEY_190 190 /*10 */
-#define KEY_F1 191 /*11 */
-#define KEY_F2 192 /*12 */
-#define KEY_F3 193 /*13 */
-#define KEY_F4 194 /*14 */
-#define KEY_F5 195 /*15 */
-#define KEY_196 196 /*16 */
-#define KEY_F6 197 /*17 */
-#define KEY_F7 198 /*18 */
-#define KEY_F8 199 /*19 */
-#define KEY_F9 200 /*20 */
-#define KEY_F10 201 /*21 */
-#define KEY_202 202 /*22 */
-#define KEY_F11 203 /*23 */
-#define KEY_F12 204 /*24 */
-#define KEY_F13 205 /*25 */
-#define KEY_F14 206 /*26 */
-#define KEY_207 207 /*27 */
-#define KEY_F15 208 /*28 */
-#define KEY_F16 209 /*29 */
-#define KEY_210 210 /*30 */
-#define KEY_F17 211 /*31 */
-#define KEY_F18 212 /*32 */
-#define KEY_F19 213 /*33 */
-#define KEY_F20 214 /*34 */
+#define KEY_147 147 /*T*/
+#define KEY_148 148 /*U*/
+#define KEY_149 149 /*V*/
+#define KEY_150 150 /*W*/
+#define KEY_151 151 /*X*/
+#define KEY_152 152 /*Y*/
+#define KEY_153 153 /*Z*/
+#define KEY_154 154 /*a */
+#define KEY_155 155 /*b */
+#define KEY_156 156 /*c */
+#define KEY_157 157 /*d */
+#define KEY_158 158 /*e */
+#define KEY_159 159 /*f */
+#define KEY_160 160 /*g */
+#define KEY_161 161 /*h */
+#define KEY_162 162 /*i */
+#define KEY_STAR 163 /*j */
+#define KEY_PLUS 164 /*k */
+#define KEY_COMMA 165 /*l */
+#define KEY_MINUS 166 /*m */
+#define KEY_PERIOD 167 /*n */
+#define KEY_DIVIDE 168 /*o */
+#define KEY_0 169 /*p */
+#define KEY_1 170 /*q */
+#define KEY_2 171 /*r */
+#define KEY_3 172 /*s */
+#define KEY_4 173 /*t */
+#define KEY_5 174 /*u */
+#define KEY_6 175 /*v */
+#define KEY_7 176 /*w */
+#define KEY_8 177 /*x */
+#define KEY_9 178 /*y */
+#define KEY_179 179 /*z */
+#define KEY_180 180 /*0 */
+#define KEY_VT220_HOME 181 /*1 */
+#define KEY_INSERT 182 /*2 */
+#define KEY_DELETE 183 /*3 */
+#define KEY_VT220_END 184 /*4 */
+#define KEY_PGUP 185 /*5 */
+#define KEY_PGDN 186 /*6 */
+#define KEY_187 187 /*7 */
+#define KEY_188 188 /*8 */
+#define KEY_189 189 /*9 */
+#define KEY_190 190 /*10 */
+#define KEY_F1 191 /*11 */
+#define KEY_F2 192 /*12 */
+#define KEY_F3 193 /*13 */
+#define KEY_F4 194 /*14 */
+#define KEY_F5 195 /*15 */
+#define KEY_196 196 /*16 */
+#define KEY_F6 197 /*17 */
+#define KEY_F7 198 /*18 */
+#define KEY_F8 199 /*19 */
+#define KEY_F9 200 /*20 */
+#define KEY_F10 201 /*21 */
+#define KEY_202 202 /*22 */
+#define KEY_F11 203 /*23 */
+#define KEY_F12 204 /*24 */
+#define KEY_F13 205 /*25 */
+#define KEY_F14 206 /*26 */
+#define KEY_207 207 /*27 */
+#define KEY_F15 208 /*28 */
+#define KEY_F16 209 /*29 */
+#define KEY_210 210 /*30 */
+#define KEY_F17 211 /*31 */
+#define KEY_F18 212 /*32 */
+#define KEY_F19 213 /*33 */
+#define KEY_F20 214 /*34 */
#define KEY_NUM 215
#endif /* __KEYS_H__ */
diff --git a/src/prototypes.h b/src/prototypes.h
index 842b12b..b79b282 100644
--- a/src/prototypes.h
+++ b/src/prototypes.h
@@ -1,184 +1,185 @@
/* 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 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);
/* 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_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);
/* 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];
@@ -187,10 +188,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 5e6b586..df54ced 100644
--- a/src/raw.c
+++ b/src/raw.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.2 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.1 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -18,46 +21,51 @@ static char rcsid[] = "$Id$";
#include "project.h"
-typedef struct {
- RX_SIGNATURE;
- int rfd;
- int wfd;
-} RX_Raw;
+typedef struct
+{
+ RX_SIGNATURE;
+ int rfd;
+ int wfd;
+} RX_Raw;
-static int rx_raw_rx(RX *_r,int ch)
+static int
+rx_raw_rx (RX * _r, int ch)
{
-RX_Raw *r=(RX_Raw *) _r;
-uint8_t c=ch;
-return (write(r->wfd,&c,1)==1) ? 0:-1;
+ RX_Raw *r = (RX_Raw *) _r;
+ uint8_t c = ch;
+ return (write (r->wfd, &c, 1) == 1) ? 0 : -1;
}
-static void rx_raw_close(RX *r)
+static void
+rx_raw_close (RX * r)
{
-free(r);
+ free (r);
}
-RX *rx_new_raw(int rfd,int wfd)
+RX *
+rx_new_raw (int rfd, int wfd)
{
RX_Raw *ret;
ret = malloc (sizeof (RX_Raw));
memset (ret, 0, sizeof (RX_Raw));
- ret->rx=rx_raw_rx;
- ret->close=rx_raw_close;
+ ret->rx = rx_raw_rx;
+ ret->close = rx_raw_close;
- ret->rfd=rfd;
- ret->wfd=wfd;
+ ret->rfd = rfd;
+ ret->wfd = wfd;
- return (RX*) ret;
+ return (RX *) ret;
}
-TTY *terminal_new_raw(int rfd,int wfd)
+TTY *
+terminal_new_raw (int rfd, int wfd)
{
//FIXME
-return NULL;
+ return NULL;
}
static void
@@ -73,14 +81,14 @@ ansi_raw_free (ANSI * a)
}
ANSI *
-ansi_new_raw (int rfd,int wfd)
+ansi_new_raw (int rfd, int wfd)
{
ANSI *ret;
ret = malloc (sizeof (ANSI));
memset (ret, 0, sizeof (ANSI));
- ret->terminal = terminal_new_raw(rfd,wfd);
+ ret->terminal = terminal_new_raw (rfd, wfd);
ret->close = ansi_raw_free;
return ret;
diff --git a/src/rx.h b/src/rx.h
index 6c5f2d0..ad140a6 100644
--- a/src/rx.h
+++ b/src/rx.h
@@ -12,6 +12,9 @@
/*
* $Log$
+ * Revision 1.3 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.2 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -25,12 +28,12 @@
#define __RX_H__
#define RX_SIGNATURE \
int (*rx)(struct RX_struct *,int); \
- void (*close)(struct RX_struct *);
+ void (*close)(struct RX_struct *);
typedef struct RX_struct
{
- RX_SIGNATURE;
+ RX_SIGNATURE;
} RX;
diff --git a/src/tty.c b/src/tty.c
index 43b5e86..62af184 100644
--- a/src/tty.c
+++ b/src/tty.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.23 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.22 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -528,11 +531,11 @@ tty_parser_new (void)
return p;
}
-int
+int
tty_parse (Context * c, uint8_t * buf, int len)
{
TTY_Parser *p;
- int err=0;
+ int err = 0;
p = c->tp;
@@ -546,7 +549,7 @@ tty_parse (Context * c, uint8_t * buf, int len)
{
case DLE:
tty_bit_analyse (c, 0, *buf);
- err+=utf8_parse (c, *buf);
+ err += utf8_parse (c, *buf);
break;
case 0:
p->in_errmark = 1;
@@ -567,9 +570,9 @@ tty_parse (Context * c, uint8_t * buf, int len)
tty_analyse (c);
- err+=utf8_parse (c, *buf);
+ err += utf8_parse (c, *buf);
- err+=utf8_parse (c, SYM_CHAR_RESET);
+ err += utf8_parse (c, SYM_CHAR_RESET);
}
else if (*buf == DLE)
@@ -583,10 +586,10 @@ tty_parse (Context * c, uint8_t * buf, int len)
tty_analyse (c);
- err+=utf8_parse (c, *buf);
+ err += utf8_parse (c, *buf);
}
buf++;
}
-return err;
+ return err;
}
diff --git a/src/utf8.c b/src/utf8.c
index 953321b..fd34fbf 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.13 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.12 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -56,7 +59,7 @@ utf8_flush (Context * c)
{
UTF8 *u = c->u;
int i;
- int err=0;
+ int err = 0;
switch (u->utf_ptr)
{
@@ -79,7 +82,7 @@ utf8_flush (Context * c)
}
for (i = 0; i < u->utf_ptr; ++i)
- err+=vt102_parse_char (c, u->utf_buf[i]);
+ err += vt102_parse_char (c, u->utf_buf[i]);
u->utf_ptr = 0;
u->in_utf8 = 0;
@@ -92,12 +95,12 @@ int
utf8_parse (Context * c, uint32_t ch)
{
UTF8 *u = c->u;
- int err=0;
+ int err = 0;
if (ch == SYM_CHAR_RESET)
{
u->in_utf8 = 0;
- err+=vt102_parse_char (c, ch);
+ err += vt102_parse_char (c, ch);
return err;
}
@@ -105,9 +108,9 @@ utf8_parse (Context * c, uint32_t ch)
{
/*FIXME: for the moment we bodge utf8 support - need to do */
/* L->R and R->L and double width characters */
- if (ch == 0xb9) //FIXME - OTHER 8 bit control chars
+ if (ch == 0xb9) //FIXME - OTHER 8 bit control chars
{ /*CSI, not a valid utf8 start char */
- err+=vt102_parse_char (c, ch);
+ err += vt102_parse_char (c, ch);
}
else if ((ch & 0xe0) == 0xc0)
{ /*Start of two byte unicode sequence */
@@ -135,15 +138,15 @@ utf8_parse (Context * c, uint32_t ch)
}
else
{
- err+=vt102_parse_char (c, ch);
+ err += vt102_parse_char (c, ch);
}
}
else
{
if ((ch & 0xc0) != 0x80)
{
- err+=utf8_flush (c);
- err+=vt102_parse_char (c, ch);
+ err += utf8_flush (c);
+ err += vt102_parse_char (c, ch);
}
else
{
@@ -153,10 +156,10 @@ utf8_parse (Context * c, uint32_t ch)
u->in_utf8--;
if (!u->in_utf8)
- err+=vt102_parse_char (c, u->ch);
+ err += vt102_parse_char (c, u->ch);
}
}
-return err;
+ return err;
}
@@ -214,7 +217,7 @@ utf8_emit (TTY * t, int ch)
if (!i)
return 0;
- if (t->xmit (t, buf, i)!=i)
- return -1;
+ if (t->xmit (t, buf, i) != i)
+ return -1;
return 0;
}
diff --git a/src/vt102.c b/src/vt102.c
index 4fd111d..4ca4578 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.60 2008/03/06 16:49:39 james
+ * *** empty log message ***
+ *
* Revision 1.59 2008/03/06 16:49:05 james
* *** empty log message ***
*
@@ -1714,17 +1717,20 @@ pre_parse_cmd (int ch, VT102_parser * p)
}
}
-int vt102_rx_hook(Context *c, int ch)
+int
+vt102_rx_hook (Context * c, int ch)
{
-if (!c->r) return 0;
-if (!c->r->rx) return 0;
-return c->r->rx(c->r,ch);
+ if (!c->r)
+ return 0;
+ if (!c->r->rx)
+ return 0;
+ return c->r->rx (c->r, ch);
}
int
vt102_parse_char (Context * c, int ch)
{
- int err=0;
+ int err = 0;
VT102 *v = c->v;
VT102_parser *p = &v->parser;
@@ -1839,22 +1845,22 @@ vt102_parse_char (Context * c, int ch)
break;
/*BS*/ case 8:
vt102_cursor_retreat (c->v);
- err+=vt102_rx_hook(c,ch);
+ err += vt102_rx_hook (c, ch);
break;
/*HT*/ case 9:
vt102_cursor_advance_tab (c->v);
- err+=vt102_rx_hook(c,ch);
+ err += vt102_rx_hook (c, ch);
break;
/*LF*/ case 10:
/*VT*/ case 11:
/*FF*/ case 12:
vt102_cursor_advance_line (c);
- err+=vt102_rx_hook(c,10);
+ err += vt102_rx_hook (c, 10);
if (!v->modes[VT102_MODE_NEWLINE_MODE])
break;
/*CR*/ case 13:
vt102_cursor_carriage_return (v);
- err+=vt102_rx_hook(c,13);
+ err += vt102_rx_hook (c, 13);
break;
/*SO*/ case 14:
/*select G1 */
@@ -1880,7 +1886,7 @@ vt102_parse_char (Context * c, int ch)
#endif
/*ESC*/ case 27:
p->in_escape++;
- break;
+ break;
#if 0
/*FS*/ case 28:
/*GS*/ case 29:
@@ -1891,7 +1897,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
@@ -1903,9 +1909,9 @@ vt102_parse_char (Context * c, int ch)
vt102_crt_update (c);
-return err;
+ return err;
}
-
+
void
vt102_send (Context * c, uint8_t key)