diff options
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | vchat-ui.c | 10 | ||||
-rwxr-xr-x | vchat-user.c | 16 |
3 files changed, 23 insertions, 5 deletions
@@ -9,7 +9,7 @@ | |||
9 | CFLAGS = -Wall -Os #-g -ggdb | 9 | CFLAGS = -Wall -Os #-g -ggdb |
10 | 10 | ||
11 | ## use this line when you've got an readline before 4.(x|2) | 11 | ## use this line when you've got an readline before 4.(x|2) |
12 | #CFLAGS += -DOLDREADLINE | 12 | CFLAGS += -DOLDREADLINE |
13 | 13 | ||
14 | ## you might need one or more of these: | 14 | ## you might need one or more of these: |
15 | #CFLAGS += -I/usr/local/ssl/include -L/usr/local/ssl/lib | 15 | #CFLAGS += -I/usr/local/ssl/include -L/usr/local/ssl/lib |
@@ -1089,16 +1089,18 @@ initui (void) | |||
1089 | 1089 | ||
1090 | /* set colors for windows */ | 1090 | /* set colors for windows */ |
1091 | if (has_colors()) { | 1091 | if (has_colors()) { |
1092 | wattrset (console, COLOR_PAIR (9)); | 1092 | // wattrset (console, COLOR_PAIR (9)); |
1093 | wattrset (input, COLOR_PAIR (0)); | 1093 | wattrset (input, COLOR_PAIR (0)); |
1094 | wattrset (topic, COLOR_PAIR (9)); | 1094 | // wattrset (topic, COLOR_PAIR (9)); |
1095 | wbkgd (output, COLOR_PAIR(8)); | 1095 | wbkgd (output, COLOR_PAIR(8)); |
1096 | wbkgd (console, COLOR_PAIR (9)); | 1096 | // wbkgd (console, COLOR_PAIR (9)); |
1097 | wbkgd (channel, COLOR_PAIR (0)); | 1097 | wbkgd (channel, COLOR_PAIR (0)); |
1098 | wbkgd (input, COLOR_PAIR (0)); | 1098 | wbkgd (input, COLOR_PAIR (0)); |
1099 | wattron (console, A_REVERSE); | ||
1100 | wattron (topic, A_REVERSE); | ||
1099 | if (private) | 1101 | if (private) |
1100 | wbkgd (private, COLOR_PAIR (0)); | 1102 | wbkgd (private, COLOR_PAIR (0)); |
1101 | wbkgd (topic, COLOR_PAIR (9)); | 1103 | // wbkgd (topic, COLOR_PAIR (9)); |
1102 | } else { | 1104 | } else { |
1103 | wattron (console, A_REVERSE); | 1105 | wattron (console, A_REVERSE); |
1104 | wattron (topic, A_REVERSE); | 1106 | wattron (topic, A_REVERSE); |
diff --git a/vchat-user.c b/vchat-user.c index 5f073a6..242480e 100755 --- a/vchat-user.c +++ b/vchat-user.c | |||
@@ -91,7 +91,9 @@ ul_add (unsigned char *name, int ignored) | |||
91 | } | 91 | } |
92 | } | 92 | } |
93 | } | 93 | } |
94 | #ifndef OLDREADLINE | ||
94 | rl_last_func = NULL; | 95 | rl_last_func = NULL; |
96 | #endif | ||
95 | } | 97 | } |
96 | 98 | ||
97 | /* delete user from userlist */ | 99 | /* delete user from userlist */ |
@@ -132,7 +134,9 @@ ul_del (unsigned char *name, int ignored) | |||
132 | ltmp = tmp; | 134 | ltmp = tmp; |
133 | tmp = tmp->next; | 135 | tmp = tmp->next; |
134 | } | 136 | } |
137 | #ifndef OLDREADLINE | ||
135 | rl_last_func = NULL; | 138 | rl_last_func = NULL; |
139 | #endif | ||
136 | } | 140 | } |
137 | 141 | ||
138 | /* let user join a channel */ | 142 | /* let user join a channel */ |
@@ -145,7 +149,9 @@ ul_join (unsigned char *name, int channel) | |||
145 | ownjoin (channel); | 149 | ownjoin (channel); |
146 | return; | 150 | return; |
147 | } else ul_moveuser(name,channel); | 151 | } else ul_moveuser(name,channel); |
152 | #ifndef OLDREADLINE | ||
148 | rl_last_func = NULL; | 153 | rl_last_func = NULL; |
154 | #endif | ||
149 | } | 155 | } |
150 | 156 | ||
151 | user * | 157 | user * |
@@ -196,7 +202,9 @@ ul_usertofront( user *who ) { | |||
196 | who->next = nicks; | 202 | who->next = nicks; |
197 | nicks = who; | 203 | nicks = who; |
198 | } | 204 | } |
205 | #ifndef OLDREADLINE | ||
199 | rl_last_func = NULL; | 206 | rl_last_func = NULL; |
207 | #endif | ||
200 | } | 208 | } |
201 | 209 | ||
202 | void | 210 | void |
@@ -229,7 +237,9 @@ ul_moveuser (unsigned char *name, int channel) { | |||
229 | tmp->chan = channel; | 237 | tmp->chan = channel; |
230 | tmp->chan_valid = 1; | 238 | tmp->chan_valid = 1; |
231 | } | 239 | } |
240 | #ifndef OLDREADLINE | ||
232 | rl_last_func = NULL; | 241 | rl_last_func = NULL; |
242 | #endif | ||
233 | } | 243 | } |
234 | 244 | ||
235 | /* let user leave a channel */ | 245 | /* let user leave a channel */ |
@@ -250,7 +260,9 @@ ul_leave (unsigned char *name, int channel) | |||
250 | tmp->chan_valid = 0; | 260 | tmp->chan_valid = 0; |
251 | return; | 261 | return; |
252 | } | 262 | } |
263 | #ifndef OLDREADLINE | ||
253 | rl_last_func = NULL; | 264 | rl_last_func = NULL; |
265 | #endif | ||
254 | } | 266 | } |
255 | 267 | ||
256 | /* let user change nick */ | 268 | /* let user change nick */ |
@@ -271,7 +283,9 @@ ul_nickchange (unsigned char *oldnick, unsigned char *newnick) | |||
271 | tmp->nick = strdup (newnick); | 283 | tmp->nick = strdup (newnick); |
272 | return; | 284 | return; |
273 | } | 285 | } |
286 | #ifndef OLDREADLINE | ||
274 | rl_last_func = NULL; | 287 | rl_last_func = NULL; |
288 | #endif | ||
275 | } | 289 | } |
276 | 290 | ||
277 | /* clear userlist */ | 291 | /* clear userlist */ |
@@ -291,7 +305,9 @@ ul_clear (void) | |||
291 | } | 305 | } |
292 | /* mark list empty */ | 306 | /* mark list empty */ |
293 | nicks = NULL; | 307 | nicks = NULL; |
308 | #ifndef OLDREADLINE | ||
294 | rl_last_func = NULL; | 309 | rl_last_func = NULL; |
310 | #endif | ||
295 | } | 311 | } |
296 | 312 | ||
297 | int ulnc_casenick(user *tmp, const unsigned char *text, int len, int value) { | 313 | int ulnc_casenick(user *tmp, const unsigned char *text, int len, int value) { |