From aff494fd2b799a5a06bdbac86e5ddfa7a20b74de Mon Sep 17 00:00:00 2001 From: james <> Date: Fri, 7 Mar 2008 14:17:01 +0000 Subject: *** empty log message *** --- apps/clients.c | 13 +++-- apps/expand.c | 45 +++++++------- apps/sympathy.c | 37 +++++++----- src/keys.h | 177 ++++++++++++++++++++++++++++---------------------------- src/terminal.c | 4 ++ src/util.c | 44 +++++++++----- sympathy.1 | 3 +- version-md5sums | 1 + version-micro | 2 +- version-stamps | 1 + 10 files changed, 181 insertions(+), 146 deletions(-) diff --git a/apps/clients.c b/apps/clients.c index b8d1a4e..d040431 100644 --- a/apps/clients.c +++ b/apps/clients.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.22 2008/03/07 14:16:44 james + * *** empty log message *** + * * Revision 1.21 2008/03/07 14:13:40 james * *** empty log message *** * @@ -134,9 +137,9 @@ client_execute_message (Client * client, IPC_Msg * m, Context * c) client_initialize (client, c); break; case IPC_MSG_TYPE_KILLME: - client->dead++; - break; - + client->dead++; + break; + default: log_f (c->l, "", m->hdr.type); } @@ -237,8 +240,8 @@ clients_post_select (Clients * cs, Context * ctx, fd_set * rfds, if (c->s->msg) { client_execute_message (c, c->s->msg, ctx); socket_consume_msg (c->s); - if (c->dead) - deaded++; + if (c->dead) + deaded++; } } diff --git a/apps/expand.c b/apps/expand.c index a0ce888..8ce384d 100644 --- a/apps/expand.c +++ b/apps/expand.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.3 2008/03/07 14:16:44 james + * *** empty log message *** + * * Revision 1.2 2008/03/07 14:13:40 james * *** empty log message *** * @@ -100,7 +103,7 @@ hex (const char **in) (*in)++; while (**in) { - printf("%c %d\n",**in,x); + printf ("%c %d\n", **in, x); if (!my_isxdigit (**in)) return x; x <<= 4; @@ -111,7 +114,7 @@ hex (const char **in) } char * -expand (const char *in,int *len) +expand (const char *in, int *len) { const char *iptr = in; int l; @@ -123,56 +126,57 @@ expand (const char *in,int *len) l = strlen (in); optr = ret = malloc (l + 1); - if (!ret) return ret; + if (!ret) + return ret; + - - l=0; + l = 0; while (*iptr) { if (*iptr == '\\') { - iptr++; + iptr++; switch (*iptr) { case '\'': case '\"': case '\?': case '\\': *(optr++) = *(iptr++); - l++; + l++; break; case 'a': *(optr++) = '\a'; - l++; + l++; iptr++; break; case 'b': *(optr++) = '\b'; - l++; + l++; iptr++; break; case 'f': *(optr++) = '\f'; - l++; + l++; iptr++; break; case 'n': *(optr++) = '\n'; - l++; + l++; iptr++; break; case 'r': *(optr++) = '\r'; - l++; + l++; iptr++; break; case 't': *(optr++) = '\t'; - l++; + l++; iptr++; break; case 'v': *(optr++) = '\v'; - l++; + l++; iptr++; break; case '0': @@ -184,25 +188,26 @@ expand (const char *in,int *len) case '6': case '7': *(optr++) = octal (&iptr); - l++; + l++; break; case 'x': *(optr++) = hex (&iptr); - l++; + l++; break; default: *(optr++) = '\\'; - l++; + l++; *(optr++) = *(iptr++); - l++; + l++; } } else { *(optr++) = *(iptr++); - l++; + l++; } } - if (*len) *len=l; + if (*len) + *len = l; *(optr++) = 0; diff --git a/apps/sympathy.c b/apps/sympathy.c index d40caba..ef120ec 100644 --- a/apps/sympathy.c +++ b/apps/sympathy.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.40 2008/03/07 14:16:44 james + * *** empty log message *** + * * Revision 1.39 2008/03/07 14:13:40 james * *** empty log message *** * @@ -148,7 +151,7 @@ static char rcsid[] = #include "mainloop.h" extern void usage (void); -extern char * expand(const char *,int *); +extern char *expand (const char *, int *); static char hostname[1024]; char *socket_dirs[] = @@ -431,18 +434,20 @@ get_hostname (void) strcat (hostname, "."); } -void send_to_server(Socket *c,char *s) +void +send_to_server (Socket * c, char *s) { -int n; + int n; -s=expand(s,&n); + s = expand (s, &n); -if (!n) return; + if (!n) + return; -while (n--) { - ipc_msg_send_key (c, *(uint8_t *)s); - s++; -} + while (n--) { + ipc_msg_send_key (c, *(uint8_t *) s); + s++; + } ipc_msg_send_killme (c); } @@ -781,11 +786,11 @@ main (int argc, char *argv[]) } if (oflags['I']) { - if (!client_socket) + if (!client_socket) fatal_moan ("-I requires either -c or -r", oargs['k']); - if (!oargs['I']) + if (!oargs['I']) fatal_moan ("-I requires an arugment"); - send_to_server(client_socket,oargs['I']); + send_to_server (client_socket, oargs['I']); } else { if (client_socket) @@ -806,13 +811,13 @@ main (int argc, char *argv[]) ansi->set_title (ansi, oargs['k']); } } - } + } - ctx->v = vt102_new (&size); - ctx->h = history_new (history); + ctx->v = vt102_new (&size); + ctx->h = history_new (history); - mainloop (ctx, ansi, server_socket, client_socket); + mainloop (ctx, ansi, server_socket, client_socket); if (ansi) { ansi->close (ansi); diff --git a/src/keys.h b/src/keys.h index 2d20966..99a7d1a 100644 --- a/src/keys.h +++ b/src/keys.h @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.10 2008/03/07 14:16:44 james + * *** empty log message *** + * * Revision 1.9 2008/03/07 14:13:40 james * *** empty log message *** * @@ -35,92 +38,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_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_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_NUM 215 #endif /* __KEYS_H__ */ diff --git a/src/terminal.c b/src/terminal.c index 6cdb15b..48f57a3 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -11,6 +11,9 @@ static char rcsid[] = /* * $Log$ + * Revision 1.19 2008/03/07 14:16:44 james + * *** empty log message *** + * * Revision 1.18 2008/03/07 14:13:40 james * *** empty log message *** * @@ -136,6 +139,7 @@ terminal_close (TTY * _t) // // // + // // to // bottom t->xmit (_t, buf, i); diff --git a/src/util.c b/src/util.c index bd4bffe..23fad88 100644 --- a/src/util.c +++ b/src/util.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.11 2008/03/07 14:13:40 james + * *** empty log message *** + * * Revision 1.10 2008/03/07 13:16:02 james * *** empty log message *** * @@ -170,28 +173,37 @@ fput_cp (FILE * f, uint32_t ch) return fwrite (buf, i, 1, f); } -void crash_out(char *why) +void +crash_out (char *why) { -terminal_atexit(); -fprintf(stderr,"sympathy is aborting: %s\n",why ? why:""); -exit(1); + terminal_atexit (); + fprintf (stderr, "sympathy is aborting: %s\n", why ? why : ""); + exit (1); } -void *xmalloc(size_t s) +void * +xmalloc (size_t s) { -void *ret=malloc(s); -if (!ret) crash_out("malloc failed"); -return ret; + void *ret = malloc (s); + if (!ret) + crash_out ("malloc failed"); + return ret; } -void *xrealloc(void *p,size_t s) + +void * +xrealloc (void *p, size_t s) { -p=realloc(p,s); -if (!p) crash_out("realloc failed"); -return p; + p = realloc (p, s); + if (!p) + crash_out ("realloc failed"); + return p; } -char *xstrdup(const char *s) + +char * +xstrdup (const char *s) { -char *ret=strdup(s); -if (!ret) crash_out("strdup failed"); -return ret; + char *ret = strdup (s); + if (!ret) + crash_out ("strdup failed"); + return ret; } diff --git a/sympathy.1 b/sympathy.1 index 2ad52c6..cbef9a5 100644 --- a/sympathy.1 +++ b/sympathy.1 @@ -251,7 +251,8 @@ chooses a socket name if \-\fBr\fP is specified. Inject \fIstring\fP to the device as if it had been typed at the keyboard. Each character in the string is treated as a keypress. .I Sympathy -recognizes various common escapes for contral characters. +recognizes various common escapes for control characters. Other keys, for example the arrow keys, +are mapped to character codes between 128 and 255. .PP .B \fIserver_options\fP: .TP 5 diff --git a/version-md5sums b/version-md5sums index f846735..d7651bf 100644 --- a/version-md5sums +++ b/version-md5sums @@ -14,3 +14,4 @@ a5ee6f647e6d98d5f06b75a70b7bf9a5 1.1.9 69a1973d2476e4c903c39e43db6b6838 1.1.10 7f8612564a03e6cb722e8692027252f2 1.1.11 0c169eaf189eb8f9b375254b69e63c31 1.1.12 +9422541c5f11969d68f1e995925f0ef5 1.1.13 diff --git a/version-micro b/version-micro index 48082f7..b1bd38b 100644 --- a/version-micro +++ b/version-micro @@ -1 +1 @@ -12 +13 diff --git a/version-stamps b/version-stamps index 4402de5..617adb5 100644 --- a/version-stamps +++ b/version-stamps @@ -7,3 +7,4 @@ a5ee6f647e6d98d5f06b75a70b7bf9a5 "February 28, 2008" 69a1973d2476e4c903c39e43db6b6838 "February 28, 2008" 7f8612564a03e6cb722e8692027252f2 "March 03, 2008" 0c169eaf189eb8f9b375254b69e63c31 "March 03, 2008" +9422541c5f11969d68f1e995925f0ef5 "March 07, 2008" -- cgit v1.2.3