From 565a348ceb0babda481d78f8f2700cf7d841e4c2 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 12 Aug 2013 19:50:50 -0400 Subject: minor improvements and bug fixes --- testing/toxic/chat.c | 38 +++++++++++++++++++++++++++----------- testing/toxic/main.c | 2 ++ 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 112b20b7..da67567d 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -79,9 +79,9 @@ static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *actio wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); wattroff(ctx->history, COLOR_PAIR(2)); - wattron(ctx->history, COLOR_PAIR(4)); + wattron(ctx->history, COLOR_PAIR(5)); wprintw(ctx->history, "%s\n", action); - wattroff(ctx->history, COLOR_PAIR(4)); + wattroff(ctx->history, COLOR_PAIR(5)); self->blink = true; beep(); @@ -104,7 +104,18 @@ static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint16_t len) { + ChatContext *ctx = (ChatContext*) self->x; + if (ctx->friendnum != num) + return; + + status[len-1] = '\0'; + fix_name(status); + snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num); + wattron(ctx->history, COLOR_PAIR(3)); + wprintw(ctx->history, " * Your partner changed status to '%s'\n", status); + wattroff(ctx->history, COLOR_PAIR(3)); + } /* check that the string has one non-space character */ @@ -157,20 +168,24 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key) if (ctx->line[0] == '/') execute(self, ctx, m, ctx->line, timeinfo); else { + /* make sure the string has at least non-space character */ if (!string_is_empty(ctx->line)) { - /* make sure the string has at least non-space character */ + uint8_t selfname[MAX_NAME_LENGTH]; + getself_name(m, selfname); + fix_name(selfname); + wattron(ctx->history, COLOR_PAIR(2)); wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); wattroff(ctx->history, COLOR_PAIR(2)); wattron(ctx->history, COLOR_PAIR(1)); - wprintw(ctx->history, "you: ", ctx->line); + wprintw(ctx->history, "%s: ", selfname); wattroff(ctx->history, COLOR_PAIR(1)); wprintw(ctx->history, "%s\n", ctx->line); - } - if (m_sendmessage(m, ctx->friendnum, (uint8_t*) ctx->line, strlen(ctx->line)+1) == 0) { - wattron(ctx->history, COLOR_PAIR(3)); - wprintw(ctx->history, " * Failed to send message.\n"); - wattroff(ctx->history, COLOR_PAIR(3)); + if (m_sendmessage(m, ctx->friendnum, (uint8_t*) ctx->line, strlen(ctx->line)+1) == 0) { + wattron(ctx->history, COLOR_PAIR(3)); + wprintw(ctx->history, " * Failed to send message.\n"); + wattroff(ctx->history, COLOR_PAIR(3)); + } } } ctx->line[0] = '\0'; @@ -214,9 +229,9 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd, struct char msg[MAX_STR_SIZE-len-4]; snprintf(msg, sizeof(msg), "* %s %s\n", (uint8_t*) selfname, action); - wattron(ctx->history, COLOR_PAIR(1)); + wattron(ctx->history, COLOR_PAIR(5)); wprintw(ctx->history, msg); - wattroff(ctx->history, COLOR_PAIR(1)); + wattroff(ctx->history, COLOR_PAIR(5)); if (m_sendaction(m, ctx->friendnum, (uint8_t*) msg, strlen(msg)+1) < 0) { wattron(ctx->history, COLOR_PAIR(3)); wprintw(ctx->history, " * Failed to send action\n"); @@ -274,6 +289,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd, struct wprintw(ctx->history, "Invalid syntax.\n"); return; } + nick++; setname(m, (uint8_t*) nick, strlen(nick)+1); wprintw(ctx->history, "Nickname set to: %s\n", nick); diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 397f9391..c5c881fd 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -124,6 +124,7 @@ static void init_term() init_pair(2, COLOR_CYAN, COLOR_BLACK); init_pair(3, COLOR_RED, COLOR_BLACK); init_pair(4, COLOR_BLUE, COLOR_BLACK); + init_pair(5, COLOR_YELLOW, COLOR_BLACK); } refresh(); } @@ -139,6 +140,7 @@ static void init_tox() m_callback_namechange(m, on_nickchange, NULL); m_callback_statusmessage(m, on_statuschange, NULL); m_callback_action(m, on_action, NULL); + setname(m, (uint8_t*) "n00b", strlen("n00b")+1); } #define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */ -- cgit v1.2.3 From 92029baff1f4e30f610de866d1efb3921240e3bb Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 12 Aug 2013 20:28:43 -0400 Subject: put a bunch of repeated code into a function and added timestamps to status/nick changes --- testing/toxic/chat.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index da67567d..a312d211 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -29,16 +29,21 @@ extern int active_window; extern void del_window(ToxWindow *w, int f_num); extern void fix_name(uint8_t *name); void print_help(ChatContext *self); -void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd, struct tm *timeinfo); +void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd); + +struct tm *get_time(void) { + struct tm *timeinfo; + time_t now; + time(&now); + timeinfo = localtime(&now); + return timeinfo; +} static void chat_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *msg, uint16_t len) { ChatContext *ctx = (ChatContext*) self->x; uint8_t nick[MAX_NAME_LENGTH] = {0}; - time_t now; - time(&now); - struct tm *timeinfo; - timeinfo = localtime(&now); + struct tm *timeinfo = get_time(); if (ctx->friendnum != num) return; @@ -64,10 +69,7 @@ static void chat_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *msg, static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *action, uint16_t len) { ChatContext *ctx = (ChatContext*) self->x; - time_t now; - time(&now); - struct tm *timeinfo; - timeinfo = localtime(&now); + struct tm *timeinfo = get_time(); if (ctx->friendnum != num) return; @@ -90,30 +92,40 @@ static void chat_onAction(ToxWindow *self, Messenger *m, int num, uint8_t *actio static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len) { ChatContext *ctx = (ChatContext*) self->x; + struct tm *timeinfo = get_time(); if (ctx->friendnum != num) return; + wattron(ctx->history, COLOR_PAIR(2)); + wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); + wattroff(ctx->history, COLOR_PAIR(2)); + nick[len-1] = '\0'; fix_name(nick); snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num); wattron(ctx->history, COLOR_PAIR(3)); - wprintw(ctx->history, " * Your partner changed nick to '%s'\n", nick); + wprintw(ctx->history, "* Your partner changed nick to '%s'\n", nick); wattroff(ctx->history, COLOR_PAIR(3)); } static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint16_t len) { ChatContext *ctx = (ChatContext*) self->x; + struct tm *timeinfo = get_time(); if (ctx->friendnum != num) return; - + + wattron(ctx->history, COLOR_PAIR(2)); + wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); + wattroff(ctx->history, COLOR_PAIR(2)); + status[len-1] = '\0'; fix_name(status); snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num); wattron(ctx->history, COLOR_PAIR(3)); - wprintw(ctx->history, " * Your partner changed status to '%s'\n", status); + wprintw(ctx->history, "* Your partner changed status to '%s'\n", status); wattroff(ctx->history, COLOR_PAIR(3)); } @@ -131,10 +143,7 @@ int string_is_empty(char *string) static void chat_onKey(ToxWindow *self, Messenger *m, int key) { ChatContext *ctx = (ChatContext*) self->x; - time_t now; - time(&now); - struct tm * timeinfo; - timeinfo = localtime(&now); + struct tm *timeinfo = get_time(); int x, y, y2, x2; getyx(self->window, y, x); @@ -166,7 +175,7 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key) wmove(self->window, y2-CURS_Y_OFFSET, 0); wclrtobot(self->window); if (ctx->line[0] == '/') - execute(self, ctx, m, ctx->line, timeinfo); + execute(self, ctx, m, ctx->line); else { /* make sure the string has at least non-space character */ if (!string_is_empty(ctx->line)) { @@ -193,7 +202,7 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key) } } -void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd, struct tm *timeinfo) +void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd) { if (!strcmp(cmd, "/clear") || !strcmp(cmd, "/c")) { wclear(self->window); @@ -213,6 +222,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd, struct } else if (!strncmp(cmd, "/me ", strlen("/me "))) { + struct tm *timeinfo = get_time(); char *action = strchr(cmd, ' '); if (action == NULL) { wprintw(self->window, "Invalid syntax.\n"); -- cgit v1.2.3 From 0ac4f1fcb33e660efcd57d546e88630168d4814b Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 12 Aug 2013 22:04:07 -0400 Subject: auto-connect errors verbose --- testing/toxic/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/testing/toxic/main.c b/testing/toxic/main.c index c5c881fd..63c4db25 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -252,10 +252,15 @@ static void init_windows() static void do_tox() { static int conn_try = 0; + static int conn_err = 0; static bool dht_on = false; if (!dht_on && !DHT_isconnected() && !(conn_try++ % 100)) { - init_connection(); - wprintw(prompt->window, "\nEstablishing connection...\n"); + if (!conn_err) { + conn_err = init_connection(); + wprintw(prompt->window, "\nEstablishing connection...\n"); + if (conn_err) + wprintw(prompt->window, "\nAuto-connect failed with error code %d\n", conn_err); + } } else if (!dht_on && DHT_isconnected()) { dht_on = true; @@ -264,7 +269,6 @@ static void do_tox() else if (dht_on && !DHT_isconnected()) { dht_on = false; wprintw(prompt->window, "\nDHT disconnected. Attempting to reconnect.\n"); - init_connection(); } doMessenger(m); } -- cgit v1.2.3 From 5c0da43d19d3ec1628494c6504da41e2ca675e61 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 12 Aug 2013 22:34:08 -0400 Subject: unresolved addresses fail silently --- testing/toxic/chat.c | 3 ++- testing/toxic/main.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index a312d211..a0a4b576 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -31,7 +31,8 @@ extern void fix_name(uint8_t *name); void print_help(ChatContext *self); void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd); -struct tm *get_time(void) { +struct tm *get_time(void) +{ struct tm *timeinfo; time_t now; time(&now); diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 63c4db25..8ef44012 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -181,7 +181,7 @@ int init_connection(void) dht.port = htons(atoi(port)); uint32_t resolved_address = resolve_addr(ip); if (resolved_address == 0) - return 4; + return 0; dht.ip.i = resolved_address; unsigned char *binary_string = hex_string_to_bin(key); DHT_bootstrap(dht, binary_string); -- cgit v1.2.3