5 files changed, 30 insertions, 40 deletions

diff --git a/testing/nTox.c b/testing/nTox.c
index f7d929f2..81cac0b6 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -89,7 +89,12 @@ char *format_message(char *message, int friendnum)
     char* time = asctime(timeinfo);
     size_t len = strlen(time);
     time[len-1] = '\0';
-    sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message); // timestamp
+    if (friendnum != -1) {
+        sprintf(msg, "[%d] %s <%s> %s", friendnum, time, name, message);
+    } else {
+        // This message came from ourselves
+        sprintf(msg, "%s <%s> %s", time, name, message);
+    }
     return msg;
 }
 
@@ -137,6 +142,9 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         }
         else if (inpt_command == 'm') { //message command: /m friendnumber messsage
             size_t len = strlen(line);
+            if(len < 3)
+              return;
+
             char numstring[len-3];
             char message[len-3];
             int i;
@@ -145,13 +153,13 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                     numstring[i] = line[i+3];
                 } else {
                     int j;
-                    for (j = (i+1); j < len; j++)
+                    for (j = (i+1); j < (len+1); j++)
                         message[j-i-1] = line[j+3];
                     break;
                 }
             }
             int num = atoi(numstring);
-            if (m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
+            if (m_sendmessage(num, (uint8_t*) message, strlen(message) + 1) != 1) {
                 new_lines("[i] could not send message");
             } else {
                 new_lines(format_message(message, -1));
@@ -166,7 +174,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                 name[i-3] = line[i];
             }
             name[i-3] = 0;
-            setname(name, i);
+            setname(name, i - 2);
             char numstring[100];
             sprintf(numstring, "[i] changed nick to %s", (char*)name);
             new_lines(numstring);
@@ -183,7 +191,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                 status[i-3] = line[i];
             }
             status[i-3] = 0;
-            m_set_userstatus(status, strlen((char*)status));
+            m_set_userstatus(status, strlen((char*)status) + 1);
             char numstring[100];
             sprintf(numstring, "[i] changed status to %s", (char*)status);
             new_lines(numstring);
@@ -317,17 +325,6 @@ void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
 
 void print_message(int friendnumber, uint8_t * string, uint16_t length)
 {
-    char name[MAX_NAME_LENGTH];
-    getname(friendnumber, (uint8_t*)name);
-    char msg[100+length+strlen(name)+1];
-    time_t rawtime;
-    struct tm * timeinfo;
-    time ( &rawtime );
-    timeinfo = localtime ( &rawtime );
-    char* temp = asctime(timeinfo);
-    size_t len = strlen(temp);
-    temp[len-1] = '\0';
-    sprintf(msg, "[%d] %s <%s> %s", friendnumber, temp, name, string); // timestamp
     new_lines(format_message((char*)string, friendnumber));
 }
 
@@ -427,7 +424,7 @@ int main(int argc, char *argv[])
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);
-    if (resolved_address != -1)
+    if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
     else 
         exit(1);
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 8d9f3547..42780923 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);
-    if (resolved_address != -1)
+    if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
     else 
         exit(1);
@@ -386,4 +386,4 @@ int main(int argc, char *argv[])
         Sleep(1);
     }
     return 0;
-}
\ No newline at end of file
+}
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index dceb1d7b..854d3817 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -60,6 +60,8 @@ static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t
   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);
   wattroff(ctx->history, COLOR_PAIR(3));
@@ -144,7 +146,11 @@ ToxWindow new_chat(int friendnum) {
   ret.onNickChange = &chat_onNickChange;
   ret.onStatusChange = &chat_onStatusChange;
 
-  snprintf(ret.title, sizeof(ret.title), "[chat %d]", friendnum);
+  uint8_t nick[MAX_NAME_LENGTH] = {0};
+  getname(friendnum, (uint8_t*) &nick);
+  fix_name(nick);
+  
+  snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum);
 
   ChatContext* x = calloc(1, sizeof(ChatContext));
   x->friendnum = friendnum;
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index fffc3f84..cdc6dc16 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -305,6 +305,9 @@ int main(int argc, char* argv[]) {
     if(ch == '\t') {
       w_active = (w_active + 1) % w_num;
     }
+    else if(ch == KEY_BTAB) {
+      w_active = (w_active + w_num - 1) % w_num;
+    }
     else if(ch != ERR) {
       a->onKey(a, ch);
     }
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 21c1f52a..b0f83811 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -16,6 +16,7 @@ uint8_t pending_requests[256][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
 
 extern void on_friendadded(int friendnumber);
+static void print_usage(ToxWindow* self);
 
 // XXX:
 int add_req(uint8_t* public_key) {
@@ -82,8 +83,8 @@ static void execute(ToxWindow* self, char* cmd) {
 
     dht.port = htons(atoi(port));
 
-    int resolved_address = resolve_addr(ip);
-    if (resolved_address == -1) {
+    uint32_t resolved_address = resolve_addr(ip);
+    if (resolved_address == 0) {
       return;
     }
 
@@ -156,24 +157,7 @@ static void execute(ToxWindow* self, char* cmd) {
   }
 
   else if(!strcmp(cmd, "help")) {
-  wattron(self->window, COLOR_PAIR(2) | A_BOLD);
-  wprintw(self->window, "Commands:\n");
-  wattroff(self->window, A_BOLD);
-  
-  wprintw(self->window, "      connect <ip> <port> <key> : Connect to DHT server\n");
-  wprintw(self->window, "      add <id> <message>        : Add friend\n");
-  wprintw(self->window, "      status <message>          : Set your status\n");
-  wprintw(self->window, "      nick <nickname>           : Set your nickname\n");
-  wprintw(self->window, "      accept <number>           : Accept friend request\n");
-  wprintw(self->window, "      myid                      : Print your ID\n");
-  wprintw(self->window, "      quit/exit                 : Exit program\n");
-
-
-  wattron(self->window, A_BOLD);
-  wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n");
-  wattroff(self->window, A_BOLD);
-
-  wattroff(self->window, COLOR_PAIR(2));
+          print_usage(self);
   }
   else if(!strncmp(cmd, "status ", strlen("status "))) {
     char* msg;