Mercurial > hg > nnchat
annotate nnchat.c @ 36:34864d021d7e
Accept 'äöå' in input.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 12 Aug 2008 21:28:10 +0300 |
| parents | c725b0dc6268 |
| children | bb25bdfc0d71 |
| rev | line source |
|---|---|
| 0 | 1 #include <sys/socket.h> |
| 2 #include <sys/types.h> | |
| 3 #include <arpa/inet.h> | |
| 4 #include <sys/time.h> | |
| 5 #include <netdb.h> | |
| 6 | |
| 7 #include <unistd.h> | |
| 8 #include <stdlib.h> | |
| 9 #include <stdio.h> | |
| 10 #include "th_args.h" | |
| 11 #include "th_string.h" | |
| 12 #include <string.h> | |
| 13 #include <errno.h> | |
| 14 #include <time.h> | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
15 #include <ncurses.h> |
| 0 | 16 |
| 30 | 17 #define SET_MAX_HISTORY (16) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
18 #define SET_BUFSIZE (4096) |
| 0 | 19 #define SET_ALLOC_SIZE (128) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
20 #define SET_DELAY (15) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
21 #define SET_DELAY_USEC (SET_DELAY * 1000) |
| 0 | 22 |
| 23 /* Options | |
| 24 */ | |
| 27 | 25 int optPort = 8005; |
| 26 int optUserColor = 0x408060; | |
| 27 char *optServer = "www11.servemedata.com", | |
| 28 *optUserName = NULL, | |
| 29 *optUserName2 = NULL, | |
| 30 *optPassword = NULL, | |
| 31 *optLogFilename = NULL, | |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
32 *setTarget = NULL, |
|
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
33 *optSite = "NN"; |
| 21 | 34 BOOL optDaemon = FALSE; |
| 0 | 35 FILE *optLogFile = NULL; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
36 WINDOW *mainWin = NULL, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
37 *statusWin = NULL, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
38 *editWin = NULL; |
| 30 | 39 BOOL setPrvMode = FALSE; |
| 0 | 40 |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
41 |
| 0 | 42 /* Arguments |
| 43 */ | |
| 44 optarg_t optList[] = { | |
| 27 | 45 { 0, '?', "help", "Show this help", OPT_NONE }, |
| 46 { 1, 'v', "verbose", "Be more verbose", OPT_NONE }, | |
| 47 { 2, 'p', "port", "Connect to port", OPT_ARGREQ }, | |
| 48 { 3, 's', "server", "Server to connect to", OPT_ARGREQ }, | |
| 49 { 4, 'C', "color", "Initial color in RGB hex 000000", OPT_ARGREQ }, | |
| 50 { 5, 'l', "logfile", "Log filename", OPT_ARGREQ }, | |
| 51 { 6, 'D', "daemon", "A pseudo-daemon mode for logging", OPT_NONE }, | |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
52 { 7, 'S', "site", "Site (default: NN)", OPT_ARGREQ }, |
| 0 | 53 }; |
| 54 | |
| 55 const int optListN = (sizeof(optList) / sizeof(optarg_t)); | |
| 56 | |
| 57 | |
| 58 void argShowHelp() | |
| 59 { | |
| 60 th_args_help(stdout, optList, optListN, th_prog_name, | |
| 61 "[options] <username> <password>"); | |
| 62 } | |
| 63 | |
| 64 | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
65 int getColor(char *str) |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
66 { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
67 char *p = str; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
68 int len, val = 0; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
69 |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
70 for (len = 0; *p && len < 6; p++, len++) { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
71 if (*p >= '0' && *p <= '9') { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
72 val *= 16; val += (*p - '0'); |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
73 } else if (*p >= 'A' && *p <= 'F') { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
74 val *= 16; val += (*p - 'A') + 10; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
75 } else if (*p >= 'a' && *p <= 'f') { |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
76 val *= 16; val += (*p - 'a') + 10; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
77 } else |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
78 return -1; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
79 } |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
80 |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
81 return (len == 6) ? val : -1; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
82 } |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
83 |
| 0 | 84 BOOL argHandleOpt(const int optN, char *optArg, char *currArg) |
| 85 { | |
| 86 switch (optN) { | |
| 87 case 0: | |
| 88 argShowHelp(); | |
| 89 exit(0); | |
| 90 break; | |
| 91 | |
| 92 case 1: | |
| 93 th_verbosityLevel++; | |
| 94 break; | |
| 95 | |
| 96 case 2: | |
| 97 optPort = atoi(optArg); | |
| 98 break; | |
| 99 | |
| 100 case 3: | |
| 101 optServer = optArg; | |
| 102 break; | |
| 103 | |
| 104 case 4: | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
105 if ((optUserColor = getColor(optArg)) < 0) { |
| 0 | 106 THERR("Invalid color argument '%s', should be a RGB hex triplet '000000'.\n", |
| 107 optArg); | |
| 108 return FALSE; | |
| 109 } | |
| 110 THMSG(1, "Using color #%06x\n", optUserColor); | |
| 111 break; | |
| 112 | |
| 113 case 5: | |
| 114 optLogFilename = optArg; | |
| 115 break; | |
| 116 | |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
117 case 7: |
|
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
118 optSite = optArg; |
|
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
119 break; |
|
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
120 |
| 21 | 121 case 6: |
| 122 optDaemon = TRUE; | |
| 123 THMSG(1, "Running in pseudo-daemon mode.\n"); | |
| 124 break; | |
| 125 | |
| 0 | 126 default: |
| 127 THERR("Unknown option '%s'.\n", currArg); | |
| 128 return FALSE; | |
| 129 } | |
| 130 | |
| 131 return TRUE; | |
| 132 } | |
| 133 | |
| 134 | |
| 135 BOOL argHandleFile(char *currArg) | |
| 136 { | |
| 137 if (!optUserName) | |
| 138 optUserName = currArg; | |
| 139 else if (!optPassword) | |
| 140 optPassword = currArg; | |
| 141 else { | |
| 142 THERR("Username '%s' already specified on commandline!\n", optUserName); | |
| 143 return FALSE; | |
| 144 } | |
| 145 | |
| 146 return TRUE; | |
| 147 } | |
| 148 | |
| 149 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
150 typedef struct { |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
151 ssize_t pos, len, size; |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
152 char *data; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
153 } editbuf_t; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
154 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
155 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
156 int writeBuf(editbuf_t *buf, ssize_t pos, int ch) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
157 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
158 /* Check arguments */ |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
159 if (buf->len+1 >= buf->size) return -3; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
160 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
161 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
162 return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
163 else if (pos >= buf->len) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
164 buf->data[buf->len++] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
165 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
166 buf->data[pos] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
167 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
168 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
169 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
170 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
171 int insertBuf(editbuf_t *buf, ssize_t pos, int ch) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
172 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
173 /* Check arguments */ |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
174 if (buf->len+1 >= buf->size) return -3; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
175 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
176 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
177 return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
178 else if (pos >= buf->len) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
179 buf->data[buf->len] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
180 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
181 memmove(&(buf->data[pos+1]), &(buf->data[pos]), buf->len - pos + 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
182 buf->data[pos] = ch; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
183 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
184 buf->len++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
185 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
186 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
187 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
188 int deleteBuf(editbuf_t *buf, ssize_t pos) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
189 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
190 /* Check arguments */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
191 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
192 return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
193 else if (pos < buf->len) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
194 memmove(&(buf->data[pos]), &(buf->data[pos+1]), buf->len - pos); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
195 buf->len--; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
196 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
197 } else |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
198 return -2; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
199 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
200 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
201 void clearBuf(editbuf_t *buf) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
202 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
203 buf->len = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
204 buf->pos = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
205 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
206 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
207 editbuf_t * newBuf(ssize_t n) |
| 30 | 208 { |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
209 editbuf_t *res = th_calloc(1, sizeof(editbuf_t)); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
210 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
211 res->data = (char *) th_malloc(n); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
212 res->size = n; |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
213 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
214 return res; |
| 30 | 215 } |
| 216 | |
| 217 void freeBuf(editbuf_t *buf) | |
| 218 { | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
219 if (buf) { |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
220 th_free(buf->data); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
221 th_free(buf); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
222 } |
| 30 | 223 } |
| 224 | |
| 225 editbuf_t * copyBuf(editbuf_t *src) | |
| 226 { | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
227 editbuf_t *res; |
| 30 | 228 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
229 assert(src != NULL); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
230 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
231 if (src == NULL) return NULL; |
| 30 | 232 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
233 if ((res = newBuf(src->size)) == NULL) |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
234 return NULL; |
| 30 | 235 |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
236 memcpy(res->data, src->data, src->size); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
237 res->pos = res->len = src->len; |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
238 |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
239 return res; |
| 30 | 240 } |
| 241 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
242 void setBufPos(editbuf_t *buf, ssize_t pos) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
243 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
244 /* Check arguments */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
245 if (pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
246 buf->pos = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
247 else if (pos >= buf->len) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
248 buf->pos = buf->len; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
249 else |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
250 buf->pos = pos; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
251 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
252 |
| 30 | 253 void updateStatus(BOOL insertMode) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
254 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
255 char tmpStr[128] = ""; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
256 time_t timeStamp; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
257 struct tm *tmpTime;; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
258 |
|
32
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
259 if (statusWin == NULL) return; |
|
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
260 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
261 timeStamp = time(NULL); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
262 if ((tmpTime = localtime(&timeStamp)) != NULL) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
263 strftime(tmpStr, sizeof(tmpStr), "%H:%M:%S", tmpTime); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
264 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
265 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
266 wbkgdset(statusWin, 0x0d00); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
267 werase(statusWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
268 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
269 wattrset(statusWin, A_BOLD); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
270 mvwaddstr(statusWin, 0, 1, tmpStr); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
271 |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
272 waddstr(statusWin, " | "); |
| 30 | 273 wattrset(statusWin, A_BOLD | COLOR_PAIR(16)); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
274 waddstr(statusWin, optUserName); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
275 wattrset(statusWin, A_BOLD | COLOR_PAIR(13)); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
276 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
277 waddstr(statusWin, " | "); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
278 wattrset(statusWin, A_BOLD | COLOR_PAIR(11)); |
| 30 | 279 waddstr(statusWin, insertMode ? "INS" : "DEL"); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
280 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
281 wattrset(statusWin, A_BOLD | COLOR_PAIR(13)); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
282 waddstr(statusWin, " | Prv: "); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
283 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
284 wattrset(statusWin, A_BOLD | COLOR_PAIR(11)); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
285 waddstr(statusWin, setTarget != NULL ? setTarget : "-"); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
286 |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
287 wattrset(statusWin, A_BOLD | COLOR_PAIR(13)); |
| 30 | 288 waddstr(statusWin, " | P/C: "); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
289 wattrset(statusWin, A_BOLD | COLOR_PAIR(11)); |
| 30 | 290 snprintf(tmpStr, sizeof(tmpStr), "%d / #%06x", optPort, optUserColor); |
|
29
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
291 waddstr(statusWin, tmpStr); |
|
a27ef0e359b9
Make statusline more informative.
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
292 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
293 wrefresh(statusWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
294 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
295 |
| 30 | 296 void printEditBuf(char *str, editbuf_t *buf) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
297 { |
|
32
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
298 if (statusWin == NULL || buf == NULL) return; |
|
67ec4073e38c
Check for NULL pointers (fixes "daemon" mode)
Matti Hamalainen <ccr@tnsp.org>
parents:
31
diff
changeset
|
299 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
300 buf->data[buf->len] = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
301 werase(editWin); |
| 30 | 302 |
| 303 wattrset(editWin, A_BOLD); | |
| 304 mvwaddstr(editWin, 0, 0, str); | |
| 305 waddstr(editWin, "> "); | |
| 306 wattrset(editWin, A_NORMAL); | |
| 307 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
308 if (buf->pos < buf->len) { |
| 30 | 309 waddnstr(editWin, buf->data, buf->pos); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
310 wattrset(editWin, A_REVERSE); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
311 waddch(editWin, buf->data[buf->pos]); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
312 wattrset(editWin, A_NORMAL); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
313 waddnstr(editWin, buf->data + buf->pos + 1, buf->len - buf->pos - 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
314 } else { |
| 30 | 315 waddnstr(editWin, buf->data, buf->len); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
316 wattrset(editWin, A_REVERSE); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
317 waddch(editWin, ' '); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
318 wattrset(editWin, A_NORMAL); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
319 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
320 wrefresh(editWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
321 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
322 |
| 15 | 323 int openConnection(struct in_addr *addr, int port) |
| 324 { | |
| 325 struct sockaddr_in tmpAddr; | |
| 326 int sock = -1; | |
| 327 | |
| 328 tmpAddr.sin_family = AF_INET; | |
| 329 tmpAddr.sin_port = htons(port); | |
| 330 tmpAddr.sin_addr = *addr; | |
| 331 | |
| 332 THMSG(1, "Connecting to %s:%d ...\n", | |
| 333 inet_ntoa(tmpAddr.sin_addr), port); | |
| 334 | |
| 335 if ((sock = socket(PF_INET, SOCK_STREAM, 0)) == -1) { | |
| 336 THERR("Could not open socket: %s\n", strerror(errno)); | |
| 337 return -2; | |
| 338 } | |
| 339 | |
| 340 THMSG(2, "Using socket %d.\n", sock); | |
| 341 | |
| 342 if (connect(sock, (struct sockaddr *) &tmpAddr, sizeof(tmpAddr)) == -1) { | |
| 343 THERR("Could not connect: %s\n", strerror(errno)); | |
| 344 return -5; | |
| 345 } | |
| 346 | |
| 347 return sock; | |
| 348 } | |
| 349 | |
| 350 | |
| 351 void closeConnection(int sock) | |
| 352 { | |
| 353 if (sock >= 0) { | |
| 354 close(sock); | |
| 355 } | |
| 356 } | |
| 357 | |
| 358 | |
| 0 | 359 BOOL sendToSocket(int sock, char *buf, const size_t bufLen) |
| 360 { | |
| 361 size_t bufLeft = bufLen; | |
| 362 char *bufPtr = buf; | |
| 363 | |
| 364 while (bufLeft > 0) { | |
| 365 ssize_t bufSent; | |
| 366 bufSent = send(sock, bufPtr, bufLeft, 0); | |
| 367 if (bufSent < 0) return FALSE; | |
| 368 bufLeft -= bufSent; | |
| 369 bufPtr += bufSent; | |
| 370 } | |
| 371 return TRUE; | |
| 372 } | |
| 373 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
374 int printWin(WINDOW *win, const char *fmt) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
375 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
376 const char *s = fmt; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
377 int col = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
378 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
379 while (*s) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
380 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
381 int val = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
382 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
383 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
384 waddch(win, *s | col); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
385 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
386 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
387 while (*s && isdigit(*s)) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
388 val *= 10; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
389 val += (*s - '0'); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
390 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
391 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
392 if (*s != '½') return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
393 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
394 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
395 if (val < 9) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
396 col = A_DIM | COLOR_PAIR(val); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
397 } else if (val < 30) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
398 col = A_BOLD | COLOR_PAIR(val - 9); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
399 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
400 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
401 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
402 waddch(win, *s | col); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
403 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
404 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
405 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
406 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
407 } |
| 0 | 408 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
409 int printFile(FILE *outFile, const char *fmt) |
| 0 | 410 { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
411 const char *s = fmt; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
412 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
413 while (*s) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
414 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
415 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
416 if (*s == '½') { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
417 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
418 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
419 while (*s && isdigit(*s)) s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
420 if (*s != '½') return -1; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
421 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
422 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
423 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
424 fputc(*s, outFile); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
425 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
426 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
427 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
428 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
429 return 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
430 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
431 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
432 void printMsg(char *fmt, ...) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
433 { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
434 char tmpStr[128] = "", buf[8192]; |
| 0 | 435 va_list ap; |
| 436 time_t timeStamp; | |
| 437 struct tm *tmpTime;; | |
| 438 | |
| 439 timeStamp = time(NULL); | |
| 440 if ((tmpTime = localtime(&timeStamp)) != NULL) { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
441 strftime(tmpStr, sizeof(tmpStr), "½17½[½11½%H:%M:%S½17½]½0½ ", tmpTime); |
| 0 | 442 } |
| 443 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
444 va_start(ap, fmt); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
445 vsnprintf(buf, sizeof(buf), fmt, ap); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
446 va_end(ap); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
447 |
| 0 | 448 if (optLogFile) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
449 printFile(optLogFile, tmpStr); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
450 printFile(optLogFile, buf); |
| 0 | 451 fflush(optLogFile); |
| 452 } | |
| 453 | |
| 21 | 454 if (!optDaemon) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
455 printWin(mainWin, tmpStr); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
456 printWin(mainWin, buf); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
457 wrefresh(mainWin); |
| 21 | 458 } |
| 0 | 459 } |
| 460 | |
| 461 | |
| 462 BOOL bufRealloc(char **buf, size_t *size, size_t add) | |
| 463 { | |
| 464 return ((*buf = th_realloc(*buf, *size + add)) != NULL); | |
| 465 } | |
| 466 | |
| 12 | 467 #define PUSHCHAR(x) bufPushChar(&result, &resSize, &resPos, x) |
| 0 | 468 BOOL bufPushChar(char **buf, size_t *size, size_t *pos, char ch) |
| 469 { | |
| 470 if (*pos >= *size && !bufRealloc(buf, size, SET_ALLOC_SIZE)) | |
| 471 return FALSE; | |
| 472 | |
| 473 (*buf)[*pos] = ch; | |
| 474 (*pos)++; | |
| 475 return TRUE; | |
| 476 } | |
| 477 | |
| 12 | 478 #define PUSHSTR(x) bufPushStr(&result, &resSize, &resPos, x) |
| 0 | 479 BOOL bufPushStr(char **buf, size_t *size, size_t *pos, char *str) |
| 480 { | |
| 481 size_t tmpLen; | |
| 482 | |
| 483 if (!str) return FALSE; | |
| 484 tmpLen = strlen(str); | |
| 485 | |
| 486 if ((*pos + tmpLen) >= *size && !bufRealloc(buf, size, tmpLen + SET_ALLOC_SIZE)) | |
| 487 return FALSE; | |
| 488 | |
| 489 strcpy(*buf + *pos, str); | |
| 490 (*pos) += tmpLen; | |
| 491 return TRUE; | |
| 492 } | |
| 493 | |
| 494 | |
| 495 char *encodeStr1(char *str) | |
| 496 { | |
| 497 char *result, *s = str; | |
| 498 size_t resSize, resPos = 0; | |
| 499 | |
| 500 if (!str) return NULL; | |
| 501 | |
| 502 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 503 if ((result = th_malloc(resSize)) == NULL) | |
| 504 return NULL; | |
| 505 | |
| 506 while (*s) { | |
| 507 switch (*s) { | |
| 508 case 32: | |
| 12 | 509 PUSHCHAR('+'); |
| 0 | 510 break; |
| 511 | |
| 512 default: | |
| 513 if (th_isalnum(*s)) | |
| 12 | 514 PUSHCHAR(*s); |
| 0 | 515 else { |
| 516 char tmpStr[4]; | |
| 517 sprintf(tmpStr, "%2X", (unsigned char) *s); | |
| 12 | 518 PUSHCHAR('%'); |
| 519 PUSHSTR(tmpStr); | |
| 0 | 520 } |
| 521 break; | |
| 522 } | |
| 523 s++; | |
| 524 } | |
| 12 | 525 PUSHCHAR(0); |
| 0 | 526 |
| 527 return result; | |
| 528 } | |
| 529 | |
| 15 | 530 |
| 0 | 531 int getxdigit(int c, int shift) |
| 532 { | |
| 533 int i; | |
| 534 | |
| 535 if (c >= 'A' && c <= 'F') | |
| 536 i = c - 'A' + 10; | |
| 537 else if (c >= 'a' && c <= 'f') | |
| 538 i = c - 'a' + 10; | |
| 539 else if (c >= '0' && c <= '9') | |
| 540 i = c - '0'; | |
| 541 else | |
| 542 return -1; | |
| 543 | |
| 544 return i << shift; | |
| 545 } | |
| 546 | |
| 15 | 547 |
| 0 | 548 char *decodeStr1(char *str) |
| 549 { | |
| 550 char *result, *s = str; | |
| 551 size_t resSize, resPos = 0; | |
| 552 int c; | |
| 553 | |
| 554 if (!str) return NULL; | |
| 555 | |
| 556 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 557 if ((result = th_malloc(resSize)) == NULL) | |
| 558 return NULL; | |
| 559 | |
| 560 while (*s) { | |
| 561 switch (*s) { | |
| 562 case '+': | |
| 12 | 563 PUSHCHAR(' '); |
| 0 | 564 s++; |
| 565 break; | |
| 566 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
567 case '½': |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
568 /* Escape these .. */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
569 PUSHCHAR('½'); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
570 PUSHCHAR('½'); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
571 s++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
572 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
573 |
| 27 | 574 case '\r': |
| 575 PUSHCHAR(' '); | |
| 576 s++; | |
| 577 break; | |
| 578 | |
| 0 | 579 case '%': |
| 580 s++; | |
| 581 if (*s == '%') | |
| 12 | 582 PUSHCHAR('%'); |
| 0 | 583 else if ((c = getxdigit(*s, 4)) >= 0) { |
| 584 int i = getxdigit(*(++s), 0); | |
| 585 if (i >= 0) { | |
| 12 | 586 PUSHCHAR(c | i); |
| 0 | 587 } else { |
| 12 | 588 PUSHCHAR('§'); |
| 589 PUSHCHAR(*s); | |
| 0 | 590 } |
| 591 } else { | |
| 12 | 592 PUSHCHAR('§'); |
| 593 PUSHCHAR(*s); | |
| 0 | 594 } |
| 595 s++; | |
| 596 break; | |
| 597 | |
| 598 default: | |
| 12 | 599 PUSHCHAR(*s); |
| 0 | 600 s++; |
| 601 } | |
| 602 } | |
| 12 | 603 PUSHCHAR(0); |
| 0 | 604 |
| 605 return result; | |
| 606 } | |
| 607 | |
| 608 | |
| 609 char *stripTags(char *str) | |
| 610 { | |
| 611 char *result, *s = str; | |
| 612 size_t resSize, resPos = 0; | |
| 613 | |
| 614 if (!str) return NULL; | |
| 615 | |
| 616 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 617 if ((result = th_malloc(resSize)) == NULL) | |
| 618 return NULL; | |
| 619 | |
| 620 while (*s) { | |
| 621 if (*s == '<') { | |
| 622 while (*s && *s != '>') s++; | |
| 623 if (*s == '>') s++; | |
| 624 } else | |
| 12 | 625 PUSHCHAR(*s++); |
| 0 | 626 } |
| 12 | 627 PUSHCHAR(0); |
| 0 | 628 |
| 629 return result; | |
| 630 } | |
| 631 | |
| 632 | |
| 633 typedef struct { | |
| 634 char c; | |
| 635 char *ent; | |
| 636 } html_entity_t; | |
| 637 | |
| 638 | |
| 639 html_entity_t HTMLEntities[] = { | |
| 640 { '<', "<" }, | |
| 641 { '>', ">" }, | |
| 642 }; | |
| 643 | |
| 644 const int numHTMLEntities = (sizeof(HTMLEntities) / sizeof(html_entity_t)); | |
| 645 | |
| 646 | |
| 647 char *encodeStr2(char *str) | |
| 648 { | |
| 649 char *result, *s = str; | |
| 650 size_t resSize, resPos = 0; | |
| 651 | |
| 652 if (!str) return NULL; | |
| 653 | |
| 654 resSize = strlen(str) + SET_ALLOC_SIZE; | |
| 655 if ((result = th_malloc(resSize)) == NULL) | |
| 656 return NULL; | |
| 657 | |
| 658 while (*s) { | |
| 659 int i; | |
| 660 BOOL found = FALSE; | |
| 661 for (i = 0; i < numHTMLEntities; i++) | |
| 662 if (HTMLEntities[i].c == *s) { | |
| 12 | 663 PUSHSTR(HTMLEntities[i].ent); |
| 0 | 664 found = TRUE; |
| 665 break; | |
| 666 } | |
| 12 | 667 if (!found) PUSHCHAR(*s); |
| 0 | 668 |
| 669 s++; | |
| 670 } | |
| 12 | 671 PUSHCHAR(0); |
| 0 | 672 |
| 673 return result; | |
| 674 } | |
| 675 | |
| 676 | |
| 677 char *decodeStr2(char *str) | |
| 678 { | |
| 679 char *result, *s = str; | |
| 680 size_t resSize, resPos = 0; | |
| 681 | |
| 682 if (!str) return NULL; | |
| 683 | |
| 684 resSize = strlen(str); | |
| 685 if ((result = th_malloc(resSize)) == NULL) | |
| 686 return NULL; | |
| 687 | |
| 688 while (*s) { | |
| 689 if (*s == '&') { | |
| 690 int i; | |
| 691 BOOL found = FALSE; | |
| 692 for (i = 0; i < numHTMLEntities; i++) { | |
| 693 html_entity_t *ent = &HTMLEntities[i]; | |
| 694 int len = strlen(ent->ent); | |
| 695 if (!strncmp(s, ent->ent, len)) { | |
| 12 | 696 PUSHCHAR(ent->c); |
| 0 | 697 s += len; |
| 698 found = TRUE; | |
| 699 break; | |
| 700 } | |
| 701 } | |
| 12 | 702 if (!found) PUSHCHAR(*s++); |
| 0 | 703 } else |
| 12 | 704 PUSHCHAR(*s++); |
| 0 | 705 } |
| 12 | 706 PUSHCHAR(0); |
| 0 | 707 |
| 708 return result; | |
| 709 } | |
| 710 | |
| 711 | |
| 712 BOOL sendUserMsg(int sock, char *user, char *fmt, ...) | |
| 713 { | |
| 714 char tmpBuf[4096], tmpBuf2[4096+256]; | |
| 715 int n; | |
| 716 va_list ap; | |
| 717 | |
| 718 va_start(ap, fmt); | |
| 719 n = vsnprintf(tmpBuf, sizeof(tmpBuf), fmt, ap); | |
| 720 va_end(ap); | |
| 721 | |
| 722 if (n < 0) return FALSE; | |
| 723 | |
| 724 snprintf(tmpBuf2, sizeof(tmpBuf2), | |
| 725 "<USER>%s</USER><MESSAGE>%s</MESSAGE>", | |
| 726 user, tmpBuf); | |
| 727 | |
| 728 return sendToSocket(sock, tmpBuf2, strlen(tmpBuf2) + 1); | |
| 729 } | |
| 730 | |
| 731 | |
| 732 int handleUser(int sock, char *str) | |
| 733 { | |
| 734 const char *msg = "</USER><MESSAGE>"; | |
| 22 | 735 char *p = str, *q, *s, *t, *h; |
| 0 | 736 |
| 737 (void) sock; | |
| 738 | |
| 739 s = strstr(str, msg); | |
| 740 if (!s) return 1; | |
| 741 *s = 0; | |
| 742 s += strlen(msg); | |
| 743 | |
| 744 q = strstr(s, "</MESSAGE>"); | |
| 745 if (!q) return 3; | |
| 746 *q = 0; | |
| 747 | |
| 748 s = decodeStr1(s); | |
| 749 if (!s) return -1; | |
| 750 | |
| 751 p = decodeStr1(p); | |
| 752 if (!p) { | |
| 753 th_free(s); | |
| 754 return -2; | |
| 755 } | |
| 756 | |
| 757 | |
| 758 if (*s == '/') { | |
| 19 | 759 if (!strncmp(s, "/BPRV", 5)) { |
| 760 t = stripTags(s + 2); | |
| 22 | 761 h = decodeStr2(t); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
762 printMsg("%s\n", h); |
| 19 | 763 } else { |
| 764 t = stripTags(s + 1); | |
| 22 | 765 h = decodeStr2(t); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
766 printMsg("* %s\n", h); |
| 19 | 767 } |
| 22 | 768 th_free(h); |
| 0 | 769 th_free(t); |
| 770 } else { | |
| 22 | 771 t = stripTags(s); |
| 772 h = decodeStr2(t); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
773 printMsg("½5½<½15½%s½5½>½0½ %s\n", p, h); |
| 22 | 774 th_free(h); |
| 0 | 775 th_free(t); |
| 776 } | |
| 777 | |
| 778 th_free(s); | |
| 779 th_free(p); | |
| 780 return 0; | |
| 781 } | |
| 782 | |
| 783 | |
| 784 int handleLogin(int sock, char *str) | |
| 785 { | |
| 19 | 786 char tmpStr[256] = ""; |
| 787 time_t timeStamp; | |
| 788 struct tm *tmpTime;; | |
| 789 | |
| 790 timeStamp = time(NULL); | |
| 791 if ((tmpTime = localtime(&timeStamp)) != NULL) { | |
| 792 strftime(tmpStr, sizeof(tmpStr), "%c", tmpTime); | |
| 793 } | |
| 794 | |
| 0 | 795 if (!strncmp(str, "FAILURE", 7)) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
796 printMsg("½1½Login failure½0½ - ½3½%s½0½\n", tmpStr); |
| 0 | 797 return -2; |
| 798 } else if (!strncmp(str, "SUCCESS", 7)) { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
799 printMsg("½2½Login success½0½ - ½3½%s½0½\n", tmpStr); |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
800 sendUserMsg(sock, optUserName2, "%%2FRequestUserList"); |
| 0 | 801 return 0; |
| 802 } else | |
| 803 return 1; | |
| 804 } | |
| 805 | |
| 806 | |
| 807 int handleAddUser(int sock, char *str) | |
| 808 { | |
| 9 | 809 char *p, *s = strstr(str, "</ADD_USER>"); |
| 0 | 810 |
| 811 (void) sock; | |
| 812 | |
| 813 if (!s) return 1; | |
| 814 *s = 0; | |
| 9 | 815 |
| 816 p = decodeStr1(str); | |
| 817 if (!p) return -1; | |
| 818 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
819 printMsg("! ½3½%s½0½ ½2½ADDED.½0½\n", p); |
| 9 | 820 th_free(p); |
| 0 | 821 return 0; |
| 822 } | |
| 823 | |
| 824 | |
| 825 int handleDeleteUser(int sock, char *str) | |
| 826 { | |
| 9 | 827 char *p, *s = strstr(str, "</DELETE_USER>"); |
| 0 | 828 |
| 829 (void) sock; | |
| 830 | |
| 831 if (!s) return 1; | |
| 832 *s = 0; | |
| 9 | 833 |
| 834 p = decodeStr1(str); | |
| 835 if (!p) return -1; | |
| 836 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
837 printMsg("! ½3½%s½0½ ½1½DELETED.½0½\n", p); |
| 9 | 838 th_free(p); |
| 0 | 839 return 0; |
| 840 } | |
| 841 | |
| 842 | |
| 843 int handleFoo(int sock, char *str) | |
| 844 { | |
| 845 (void) sock; (void) str; | |
| 846 | |
| 847 return 0; | |
| 848 } | |
| 849 | |
| 850 | |
| 851 typedef struct { | |
| 852 char *cmd; | |
| 853 int (*handler)(int, char *); | |
| 854 } protocmd_t; | |
| 855 | |
| 856 | |
| 857 protocmd_t protoCmds[] = { | |
| 858 { "<USER>", handleUser }, | |
| 859 { "<LOGIN_", handleLogin }, | |
| 860 { "<DELETE_USER>", handleDeleteUser }, | |
| 861 { "<ADD_USER>", handleAddUser }, | |
| 862 { "<NUMCLIENTS>", handleFoo }, | |
| 863 }; | |
| 864 | |
| 865 const int nprotoCmds = (sizeof(protoCmds) / sizeof(protocmd_t)); | |
| 866 | |
| 867 | |
| 868 int handleProtocol(int sock, char *buf, size_t bufLen) | |
| 869 { | |
| 870 int i; | |
| 871 | |
| 872 for (i = 0; i < nprotoCmds; i++) { | |
| 873 size_t cmdLen = strlen(protoCmds[i].cmd); | |
| 874 if (cmdLen < bufLen && !strncmp(buf, protoCmds[i].cmd, cmdLen)) { | |
| 875 return protoCmds[i].handler(sock, buf + cmdLen); | |
| 876 } | |
| 877 } | |
| 878 | |
| 879 return 1; | |
| 880 } | |
| 881 | |
| 882 | |
| 15 | 883 int handleUserInput(int sock, char *buf, size_t bufLen) |
| 0 | 884 { |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
885 char *tmpStr, *tmpStr2, tmpBuf[4096]; |
| 0 | 886 BOOL result; |
| 887 | |
| 888 /* Trim right */ | |
| 889 buf[--bufLen] = 0; | |
| 890 while (bufLen > 0 && (buf[bufLen] == '\n' || buf[bufLen] == '\r' || th_isspace(buf[bufLen]))) | |
| 891 buf[bufLen--] = 0; | |
| 892 | |
| 893 /* Check command */ | |
| 894 if (*buf == 0) { | |
| 895 return 1; | |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
896 } else if (!strncmp(buf, "/color ", 7)) { |
| 30 | 897 int tmpInt; |
| 898 if ((tmpInt = getColor(buf+7)) < 0) { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
899 printMsg("Invalid color value '%s'\n", buf+7); |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
900 return 1; |
|
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
901 } |
| 30 | 902 optUserColor = tmpInt; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
903 printMsg("Setting color to #%06x\n", optUserColor); |
|
25
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
904 sendUserMsg(sock, optUserName2, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor); |
|
3b67a9a806a7
Added /color command to change colour.
Matti Hamalainen <ccr@tnsp.org>
parents:
24
diff
changeset
|
905 return 0; |
| 27 | 906 } else if (!strncmp(buf, "/flood ", 7)) { |
| 907 int i; | |
| 908 | |
| 909 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg . .", | |
| 910 buf+7); | |
| 911 | |
| 912 tmpStr = encodeStr2(tmpBuf); | |
| 913 if (!tmpStr) return -2; | |
| 914 tmpStr2 = encodeStr1(tmpStr); | |
| 915 if (!tmpStr2) { | |
| 916 th_free(tmpStr); | |
| 917 return -3; | |
| 918 } | |
| 919 | |
| 920 result = TRUE; | |
| 921 for (i = 0; i < 50 && result; i++) { | |
| 922 result = sendUserMsg(sock, optUserName2, "%s", tmpStr2); | |
| 923 usleep(250); | |
| 924 } | |
| 925 | |
| 926 th_free(tmpStr); | |
| 927 th_free(tmpStr2); | |
| 928 return 0; | |
| 30 | 929 } else if (!strncmp(buf, "/to ", 4)) { |
| 930 buf += 4; | |
| 931 th_free(setTarget); | |
| 932 setTarget = th_strdup(buf); | |
| 933 printMsg("Set prv target to '%s'\n", setTarget); | |
| 934 return 0; | |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
935 } else if (!strncmp(buf, "/msg ", 5)) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
936 if (setTarget != NULL) { |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
937 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg %s", setTarget, buf+5); |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
938 buf = tmpBuf; |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
939 } else { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
940 printMsg("No target set!\n"); |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
941 return 1; |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
942 } |
| 30 | 943 } else if (setPrvMode) { |
| 944 if (setTarget != NULL) { | |
| 945 snprintf(tmpBuf, sizeof(tmpBuf), "/prv -to %s -msg %s", setTarget, buf); | |
| 946 buf = tmpBuf; | |
| 947 } else { | |
| 948 printMsg("No target set, exiting prv mode.\n"); | |
| 949 setPrvMode = FALSE; | |
| 950 return 1; | |
| 951 } | |
|
24
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
952 } |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
953 |
|
78d260256450
Added two simple commands to simplify private chatting, "/to" and "/msg".
Matti Hamalainen <ccr@tnsp.org>
parents:
23
diff
changeset
|
954 { |
| 0 | 955 /* Send double-encoded */ |
| 956 tmpStr = encodeStr2(buf); | |
| 957 if (!tmpStr) return -2; | |
| 958 tmpStr2 = encodeStr1(tmpStr); | |
| 959 if (!tmpStr2) { | |
| 960 th_free(tmpStr); | |
| 961 return -3; | |
| 962 } | |
| 963 | |
| 964 result = sendUserMsg(sock, optUserName2, "%s", tmpStr2); | |
| 965 th_free(tmpStr); | |
| 966 th_free(tmpStr2); | |
| 967 if (result) | |
| 968 return 0; | |
| 969 else | |
| 970 return -1; | |
| 971 } | |
| 972 } | |
| 973 | |
| 974 | |
| 975 int main(int argc, char *argv[]) | |
| 976 { | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
977 int tmpSocket, curVis, updateCount = 0; |
| 0 | 978 struct hostent *tmpHost; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
979 BOOL argsOK, isError = FALSE, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
980 exitProg = FALSE, |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
981 colorSet = FALSE, |
| 30 | 982 cursesInit = FALSE, |
| 983 insertMode = TRUE; | |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
984 struct timeval tv; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
985 fd_set sockfds; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
986 char *tmpStr; |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
987 editbuf_t *editBuf = newBuf(SET_BUFSIZE); |
| 30 | 988 editbuf_t *histBuf[SET_MAX_HISTORY+2]; |
| 989 int histPos = 0, histMax = 0; | |
| 990 | |
| 991 memset(histBuf, 0, sizeof(histBuf)); | |
| 992 | |
| 0 | 993 /* Initialize */ |
|
34
f5d335771b16
Fix a bug with mixed editBuf->pos vs editBuf->len.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
994 th_init("NNChat", "Newbie Nudes chat client", "0.6", |
|
6
526ba3b578d7
Changed copyright etc. again.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
995 "Written and designed by Anonymous Finnish Guy (C) 2008", |
|
526ba3b578d7
Changed copyright etc. again.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
996 "This software is freeware, use and distribute as you wish."); |
| 0 | 997 th_verbosityLevel = 0; |
| 998 | |
| 999 /* Parse arguments */ | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1000 argsOK = th_args_process(argc, argv, optList, optListN, |
| 0 | 1001 argHandleOpt, argHandleFile, FALSE); |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1002 |
| 0 | 1003 /* Check the mode and arguments */ |
| 1004 if (optUserName == NULL || optPassword == NULL) { | |
| 1005 THERR("User/pass not specified, get some --help\n"); | |
| 1006 return -1; | |
| 1007 } | |
| 1008 | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1009 if (!argsOK) |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1010 return -2; |
|
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1011 |
| 0 | 1012 /* Open logfile */ |
| 1013 if (optLogFilename) { | |
| 1014 THMSG(1, "Opening logfile '%s'\n", optLogFilename); | |
| 1015 | |
| 1016 if ((optLogFile = fopen(optLogFilename, "a")) == NULL) { | |
| 1017 THERR("Could not open logfile for appending!\n"); | |
| 1018 return -9; | |
| 1019 } | |
| 1020 } | |
| 1021 | |
| 1022 /* Okay ... */ | |
| 1023 THMSG(1, "Trying to resolve host '%s' ...\n", optServer); | |
| 1024 tmpHost = gethostbyname(optServer); | |
| 1025 if (tmpHost == NULL) { | |
| 1026 THERR("Could not resolve hostname: %s.\n", | |
| 1027 hstrerror(h_errno)); | |
| 1028 return -3; | |
| 1029 } | |
| 1030 THMSG(2, "True hostname: %s\n", tmpHost->h_name); | |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1031 |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1032 /* To emulate the official client, we first make a fake connection ... */ |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1033 if ((tmpSocket = openConnection((struct in_addr *) tmpHost->h_addr, optPort)) < 0) { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1034 THERR("Fakeprobe connection setup failed!\n"); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1035 goto err_exit; |
| 0 | 1036 } |
| 1037 | |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1038 tmpStr = "<policy-file-request/>"; |
|
23
40fecbab1dc1
Check for error condition properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1039 if (sendToSocket(tmpSocket, tmpStr, strlen(tmpStr) + 1) == FALSE) { |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1040 THERR("Failed to send fakeprobe.\n"); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1041 goto err_exit; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1042 } else { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1043 ssize_t gotBuf; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1044 char tmpBuf[4096]; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1045 gotBuf = recv(tmpSocket, tmpBuf, sizeof(tmpBuf), 0); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1046 tmpBuf[gotBuf-1] = 0; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1047 THMSG(2, "Probe got: %s\n", tmpBuf); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1048 closeConnection(tmpSocket); |
| 0 | 1049 } |
|
26
b84fc46c6035
Improved color hex triplet parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1050 |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1051 /* Okay, now do the proper connection ... */ |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1052 if ((tmpSocket = openConnection((struct in_addr *) tmpHost->h_addr, optPort)) < 0) { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1053 THERR("Main connection setup failed!\n"); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1054 goto err_exit; |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1055 } |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1056 |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
1057 THMSG(1, "Connected, logging in as '%s', site '%s'.\n", optUserName, optSite); |
| 0 | 1058 optUserName2 = encodeStr1(optUserName); |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
1059 tmpStr = encodeStr1(optSite); |
|
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
1060 sendUserMsg(tmpSocket, optUserName2, "%%2Flogin%%20%%2Dsite%%20%s%%20%%2Dpassword%%20%s", tmpStr, optPassword); |
|
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
1061 th_free(tmpStr); |
| 0 | 1062 |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
1063 /* Initialize NCurses */ |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1064 if (!optDaemon) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1065 initscr(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1066 raw(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1067 keypad(stdscr, TRUE); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1068 noecho(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1069 timeout(SET_DELAY); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1070 curVis = curs_set(0); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1071 if (has_colors()) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1072 start_color(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1073 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1074 init_pair(1, COLOR_RED, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1075 init_pair(2, COLOR_GREEN, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1076 init_pair(3, COLOR_YELLOW, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1077 init_pair(4, COLOR_BLUE, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1078 init_pair(5, COLOR_MAGENTA, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1079 init_pair(6, COLOR_CYAN, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1080 init_pair(7, COLOR_WHITE, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1081 init_pair(8, COLOR_BLACK, COLOR_BLACK); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1082 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1083 init_pair(10, COLOR_BLACK, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1084 init_pair(11, COLOR_WHITE, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1085 init_pair(12, COLOR_GREEN, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1086 init_pair(13, COLOR_YELLOW, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1087 init_pair(14, COLOR_BLUE, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1088 init_pair(15, COLOR_MAGENTA, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1089 init_pair(16, COLOR_CYAN, COLOR_RED); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1090 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1091 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1092 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1093 mainWin = newwin(LINES - 4, COLS, 0, 0); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1094 statusWin = newwin(1, COLS, LINES - 4, 0); |
|
35
c725b0dc6268
Fix the editline being 2 lines instead of 3.
Matti Hamalainen <ccr@tnsp.org>
parents:
34
diff
changeset
|
1095 editWin = newwin(3, COLS, LINES - 3, 0); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1096 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1097 if (mainWin == NULL || statusWin == NULL || editWin == NULL) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1098 THERR("Could not create ncurses windows!\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1099 goto err_exit; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1100 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1101 scrollok(mainWin, 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1102 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1103 clearBuf(editBuf); |
| 30 | 1104 printEditBuf("", editBuf); |
| 1105 updateStatus(insertMode); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1106 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1107 cursesInit = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1108 } |
| 30 | 1109 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1110 |
| 30 | 1111 /* Enter mainloop */ |
| 0 | 1112 FD_ZERO(&sockfds); |
| 1113 FD_SET(tmpSocket, &sockfds); | |
| 1114 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1115 while (!isError && !exitProg) { |
| 0 | 1116 int result; |
| 1117 fd_set tmpfds; | |
| 1118 | |
| 1119 /* Check for incoming data from the server */ | |
| 1120 tv.tv_sec = 0; | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1121 tv.tv_usec = SET_DELAY_USEC; |
| 0 | 1122 tmpfds = sockfds; |
| 1123 if ((result = select(tmpSocket+1, &tmpfds, NULL, NULL, &tv)) == -1) { | |
| 27 | 1124 printMsg("Error occured in select(sockfds): %s\n", |
| 1125 strerror(errno)); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1126 isError = TRUE; |
| 0 | 1127 } else if (FD_ISSET(tmpSocket, &tmpfds)) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1128 ssize_t gotBuf; |
| 30 | 1129 char tmpBuf[8192]; |
| 0 | 1130 gotBuf = recv(tmpSocket, tmpBuf, sizeof(tmpBuf), 0); |
| 1131 | |
| 1132 if (gotBuf < 0) { | |
| 9 | 1133 printMsg("Error in recv: %s\n", strerror(errno)); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1134 isError = TRUE; |
| 0 | 1135 } else if (gotBuf == 0) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1136 printMsg("Server closed connection.\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1137 isError = TRUE; |
| 0 | 1138 } else { |
| 1139 /* Handle protocol data */ | |
| 1140 tmpBuf[gotBuf] = 0; | |
| 1141 result = handleProtocol(tmpSocket, tmpBuf, gotBuf); | |
| 1142 | |
| 1143 if (result > 0) { | |
| 1144 /* Couldn't handle the message for some reason */ | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1145 printMsg("Could not handle: %s\n", tmpBuf); |
| 0 | 1146 } else if (result < 0) { |
| 1147 /* Fatal error, quit */ | |
| 9 | 1148 printMsg("Fatal error with message: %s\n", tmpBuf); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1149 isError = TRUE; |
| 0 | 1150 } |
| 30 | 1151 updateStatus(insertMode); |
| 0 | 1152 } |
| 1153 } | |
| 1154 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1155 /* Handle user input */ |
| 21 | 1156 if (!optDaemon) { |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1157 int c, cnt = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1158 BOOL update = FALSE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1159 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1160 /* Handle several buffered keypresses at once */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1161 do { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1162 c = getch(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1163 switch (c) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1164 case KEY_ENTER: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1165 case '\n': |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1166 case '\r': |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1167 /* Call the user input handler */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1168 if (editBuf->len > 0) { |
| 30 | 1169 |
| 1170 if (histMax > 0) { | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1171 freeBuf(histBuf[SET_MAX_HISTORY+1]); |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1172 histBuf[SET_MAX_HISTORY+1] = NULL; |
| 30 | 1173 memmove(&histBuf[2], &histBuf[1], histMax * sizeof(histBuf[0])); |
| 1174 } | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1175 |
| 30 | 1176 histPos = 0; |
| 1177 histBuf[1] = copyBuf(editBuf); | |
| 1178 if (histMax < SET_MAX_HISTORY) histMax++; | |
| 1179 | |
|
34
f5d335771b16
Fix a bug with mixed editBuf->pos vs editBuf->len.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1180 insertBuf(editBuf, editBuf->len, 0); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1181 result = handleUserInput(tmpSocket, editBuf->data, editBuf->len); |
| 30 | 1182 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1183 clearBuf(editBuf); |
| 30 | 1184 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1185 if (result < 0) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1186 printMsg("Fatal error handling user input: %s\n", editBuf->data); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1187 isError = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1188 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1189 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1190 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1191 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1192 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1193 |
| 30 | 1194 case 0x09: /* Tab = switch between PRV */ |
| 1195 if (setPrvMode) | |
| 1196 setPrvMode = FALSE; | |
| 1197 else { | |
| 1198 if (setTarget != NULL) | |
| 1199 setPrvMode = TRUE; | |
| 1200 } | |
| 1201 update = TRUE; | |
| 1202 break; | |
| 1203 | |
| 1204 case KEY_UP: | |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1205 if (histPos == 0) { |
|
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1206 freeBuf(histBuf[0]); |
| 30 | 1207 histBuf[0] = copyBuf(editBuf); |
|
31
9b429b283786
Add command history functionality.
Matti Hamalainen <ccr@tnsp.org>
parents:
30
diff
changeset
|
1208 } |
| 30 | 1209 if (histPos < histMax) { |
| 1210 histPos++; | |
| 1211 freeBuf(editBuf); | |
| 1212 editBuf = copyBuf(histBuf[histPos]); | |
| 1213 update = TRUE; | |
| 1214 } | |
| 1215 break; | |
| 1216 | |
| 1217 case KEY_DOWN: | |
| 1218 if (histPos > 0) { | |
| 1219 histPos--; | |
| 1220 freeBuf(editBuf); | |
| 1221 editBuf = copyBuf(histBuf[histPos]); | |
| 1222 update = TRUE; | |
| 1223 } | |
| 1224 break; | |
| 1225 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1226 case 0x109: /* F1 */ |
| 30 | 1227 if (insertMode) |
| 1228 insertMode = FALSE; | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1229 else |
| 30 | 1230 insertMode = TRUE; |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1231 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1232 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1233 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1234 case 0x204: /* ctrl+left */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1235 editBuf->pos--; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1236 while (editBuf->pos > 0 && !isspace(editBuf->data[editBuf->pos])) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1237 editBuf->pos--; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1238 if (editBuf->pos < 0) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1239 editBuf->pos = 0; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1240 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1241 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1242 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1243 case 0x206: /* ctrl+right */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1244 editBuf->pos++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1245 while (editBuf->pos < editBuf->len && !isspace(editBuf->data[editBuf->pos])) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1246 editBuf->pos++; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1247 if (editBuf->pos > editBuf->len) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1248 editBuf->pos = editBuf->len; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1249 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1250 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1251 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1252 case 0x111: /* F9 */ |
|
33
e49ea6febfeb
Cleanups. Added option to specify/fake "site" where logging in from.
Matti Hamalainen <ccr@tnsp.org>
parents:
32
diff
changeset
|
1253 printMsg("Quitting per user request.\n"); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1254 exitProg = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1255 break; |
| 0 | 1256 |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1257 case 0x10a: /* F2 */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1258 clearBuf(editBuf); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1259 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1260 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1261 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1262 case KEY_HOME: setBufPos(editBuf, 0); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1263 case KEY_END: setBufPos(editBuf, editBuf->len); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1264 case KEY_LEFT: setBufPos(editBuf, editBuf->pos - 1); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1265 case KEY_RIGHT: setBufPos(editBuf, editBuf->pos + 1); update = TRUE; break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1266 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1267 case KEY_BACKSPACE: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1268 deleteBuf(editBuf, editBuf->pos - 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1269 setBufPos(editBuf, editBuf->pos - 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1270 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1271 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1272 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1273 case 0x14a: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1274 /* Delete */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1275 deleteBuf(editBuf, editBuf->pos); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1276 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1277 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1278 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1279 case 0x0c: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1280 /* ctrl+l */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1281 redrawwin(mainWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1282 redrawwin(statusWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1283 redrawwin(editWin); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1284 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1285 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1286 case ERR: |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1287 /* Ignore */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1288 break; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1289 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1290 default: |
| 36 | 1291 if (isprint(c) || c == 0xe4 || c == 0xf6 || c == 0xc4 || c == 0xd6) { |
| 30 | 1292 if (insertMode) |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1293 insertBuf(editBuf, editBuf->pos, c); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1294 else |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1295 writeBuf(editBuf, editBuf->pos, c); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1296 setBufPos(editBuf, editBuf->pos + 1); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1297 update = TRUE; |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1298 } else { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1299 printMsg("Unhandled key: %02x\n", c); |
| 0 | 1300 } |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1301 break; |
| 0 | 1302 } |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1303 } while (c != ERR && !exitProg && ++cnt < 10); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1304 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1305 if (update) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1306 /* Update edit line */ |
| 30 | 1307 printEditBuf(setPrvMode ? setTarget : "", editBuf); |
| 1308 updateStatus(insertMode); | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1309 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1310 } /* !optDaemon */ |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1311 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1312 if (++updateCount > 10) { |
| 30 | 1313 updateStatus(insertMode); |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1314 updateCount = 0; |
| 0 | 1315 } |
| 1316 | |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1317 if (!colorSet) { |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1318 colorSet = TRUE; |
| 30 | 1319 printMsg("%s v%s - %s\n", th_prog_name, th_prog_version, th_prog_fullname); |
| 1320 printMsg("%s\n", th_prog_author); | |
| 1321 printMsg("%s\n", th_prog_license); | |
| 27 | 1322 sendUserMsg(tmpSocket, optUserName2, "%%2FSetFontColor%%20%%2Dcolor%%20%06X", optUserColor); |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1323 } |
| 0 | 1324 } |
| 1325 | |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1326 /* Shutdown */ |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1327 err_exit: |
|
28
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1328 if (cursesInit) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1329 if (curVis != ERR) |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1330 curs_set(curVis); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1331 endwin(); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1332 THMSG(1, "NCurses deinitialized.\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1333 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1334 |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1335 if (isError) { |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1336 THMSG(1, "Error exit.\n"); |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1337 } |
|
512775f6b081
A refactored ncurses-based UI.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1338 |
| 0 | 1339 th_free(optUserName2); |
| 10 | 1340 |
|
13
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1341 closeConnection(tmpSocket); |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1342 |
|
86fe5f0d1a85
Cleanups; Added probing connection (requesting some policy crap) to emulate the official client.
Matti Hamalainen <ccr@tnsp.org>
parents:
12
diff
changeset
|
1343 THMSG(1, "Connection terminated.\n"); |
| 0 | 1344 |
| 1345 if (optLogFile) { | |
| 1346 THMSG(1, "Closing logfile.\n"); | |
| 1347 fclose(optLogFile); | |
| 1348 } | |
| 1349 | |
| 1350 return 0; | |
| 1351 } |