6 files changed, 518 insertions, 52 deletions

diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
new file mode 100644
index 00000000..f30d8e9e
--- /dev/null
+++ b/testing/toxic/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(toxic C)
+
+set(exe_name toxic)
+
+add_executable(${exe_name}
+        main.c
+        prompt.c
+        friendlist.c
+        chat.c)
+
+target_link_libraries(${exe_name}
+        curses)
+
+linkCoreLibraries(${exe_name})
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
new file mode 100644
index 00000000..dceb1d7b
--- /dev/null
+++ b/testing/toxic/chat.c
@@ -0,0 +1,155 @@
+/*
+ * Toxic -- Tox Curses Client
+ */
+
+#include <curses.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+
+#include "../../core/Messenger.h"
+#include "../../core/network.h"
+
+#include "windows.h"
+
+typedef struct {
+  int friendnum;
+
+  char line[256];
+  size_t pos;
+
+  WINDOW* history;
+  WINDOW* linewin;
+
+} ChatContext;
+
+extern void fix_name(uint8_t* name);
+
+
+static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) {
+  ChatContext* ctx = (ChatContext*) self->x;
+  uint8_t nick[MAX_NAME_LENGTH] = {0};
+
+  if(ctx->friendnum != num)
+    return;
+
+  getname(num, (uint8_t*) &nick);
+
+  msg[len-1] = '\0';
+  nick[MAX_NAME_LENGTH-1] = '\0';
+
+  fix_name(msg);
+  fix_name(nick);
+
+  wattron(ctx->history, COLOR_PAIR(4));
+  wprintw(ctx->history, "%s: ", nick);
+  wattroff(ctx->history, COLOR_PAIR(4));
+
+  wprintw(ctx->history, "%s\n", msg);
+
+  self->blink = true;
+}
+
+static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t len) {
+  ChatContext* ctx = (ChatContext*) self->x;
+
+  if(ctx->friendnum != num)
+    return;
+
+  nick[len-1] = '\0';
+  fix_name(nick);
+
+  wattron(ctx->history, COLOR_PAIR(3));
+  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) {
+
+}
+
+static void chat_onKey(ToxWindow* self, int key) {
+  ChatContext* ctx = (ChatContext*) self->x;
+
+  if(isprint(key)) {
+
+    if(ctx->pos != sizeof(ctx->line)-1) {
+      ctx->line[ctx->pos++] = key;
+      ctx->line[ctx->pos] = '\0';
+    }
+  }
+  else if(key == '\n') {
+    wattron(ctx->history, COLOR_PAIR(1));
+    wprintw(ctx->history, "you: ", ctx->line);
+    wattroff(ctx->history, COLOR_PAIR(1));
+
+    wprintw(ctx->history, "%s\n", ctx->line);
+
+    if(m_sendmessage(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';
+    ctx->pos = 0;
+  }
+  else if(key == 0x107 || key == 0x8 || key == 0x7f) {
+    if(ctx->pos != 0) {
+      ctx->line[--ctx->pos] = '\0';
+    }
+  }
+  
+}
+
+static void chat_onDraw(ToxWindow* self) {
+  int x, y;
+  ChatContext* ctx = (ChatContext*) self->x;
+
+  getmaxyx(self->window, y, x);
+
+  (void) x;
+  if(y < 3)
+    return;
+
+  wclear(ctx->linewin);
+  mvwhline(ctx->linewin, 0, 0, '_', COLS);
+  mvwprintw(ctx->linewin, 1, 0, "%s\n", ctx->line);
+
+  wrefresh(self->window);
+}
+
+static void chat_onInit(ToxWindow* self) {
+  int x, y;
+  ChatContext* ctx = (ChatContext*) self->x;
+
+  getmaxyx(self->window, y, x);
+
+  ctx->history = subwin(self->window, y - 4, x, 0, 0);
+  scrollok(ctx->history, 1);
+
+  ctx->linewin = subwin(self->window, 2, x, y - 3, 0);
+}
+
+ToxWindow new_chat(int friendnum) {
+  ToxWindow ret;
+
+  memset(&ret, 0, sizeof(ret));
+
+  ret.onKey = &chat_onKey;
+  ret.onDraw = &chat_onDraw;
+  ret.onInit = &chat_onInit;
+  ret.onMessage = &chat_onMessage;
+  ret.onNickChange = &chat_onNickChange;
+  ret.onStatusChange = &chat_onStatusChange;
+
+  snprintf(ret.title, sizeof(ret.title), "[chat %d]", friendnum);
+
+  ChatContext* x = calloc(1, sizeof(ChatContext));
+  x->friendnum = friendnum;
+
+  ret.x = (void*) x;
+
+  return ret;
+}
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
new file mode 100644
index 00000000..f9a413f9
--- /dev/null
+++ b/testing/toxic/friendlist.c
@@ -0,0 +1,166 @@
+/*
+ * Toxic -- Tox Curses Client
+ */
+
+#include <curses.h>
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+
+#include "../../core/Messenger.h"
+#include "../../core/network.h"
+
+#include "windows.h"
+
+extern int add_window(ToxWindow w);
+extern int focus_window(int num);
+extern ToxWindow new_chat(int friendnum);
+
+#define MAX_FRIENDS_NUM 100
+
+typedef struct {
+  uint8_t name[MAX_NAME_LENGTH];
+  uint8_t status[MAX_USERSTATUS_LENGTH];
+  int     num;
+  int     chatwin;
+} friend_t;
+
+static friend_t friends[MAX_FRIENDS_NUM];
+static int num_friends = 0;
+static int num_selected = 0;
+
+
+void fix_name(uint8_t* name) {
+
+  // Remove all non alphanumeric characters.
+  uint8_t* p = name;
+  uint8_t* q = name;
+
+  while(*p != 0) {
+    if(isprint(*p)) {
+      *q++ = *p;
+    }
+
+    p++;
+  }
+
+  *q = 0;
+}
+
+void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len) {
+
+  if(num >= num_friends)
+    return;
+
+  if(friends[num].chatwin == -1) {
+    friends[num].chatwin = add_window(new_chat(num));
+  }
+}
+
+void friendlist_onNickChange(ToxWindow* self, int num, uint8_t* str, uint16_t len) {
+
+  if(len >= MAX_NAME_LENGTH || num >= num_friends)
+    return;
+
+  memcpy((char*) &friends[num].name, (char*) str, len);
+  friends[num].name[len] = 0;
+  fix_name(friends[num].name);
+}
+
+void friendlist_onStatusChange(ToxWindow* self, int num, uint8_t* str, uint16_t len) {
+
+  if(len >= MAX_USERSTATUS_LENGTH || num >= num_friends)
+    return;
+
+  memcpy((char*) &friends[num].status, (char*) str, len);
+  friends[num].status[len] = 0;
+  fix_name(friends[num].status);
+}
+
+int friendlist_onFriendAdded(int num) {
+
+  if(num_friends == MAX_FRIENDS_NUM)
+    return -1;
+
+  friends[num_friends].num = num;
+  getname(num, friends[num_friends].name);
+  strcpy((char*) friends[num_friends].name, "unknown");
+  strcpy((char*) friends[num_friends].status, "unknown");
+  friends[num_friends].chatwin = -1;
+
+  num_friends++;
+  return 0;
+}
+
+static void friendlist_onKey(ToxWindow* self, int key) {
+
+  if(key == KEY_UP) {
+    if(num_selected != 0)
+      num_selected--;
+  }
+  else if(key == KEY_DOWN) {
+    if(num_friends != 0)
+      num_selected = (num_selected+1) % num_friends;
+  }
+  else if(key == '\n') {
+
+    if(friends[num_selected].chatwin != -1)
+      return;
+
+    friends[num_selected].chatwin = add_window(new_chat(num_selected));
+    focus_window(friends[num_selected].chatwin);
+  }
+}
+
+static void friendlist_onDraw(ToxWindow* self) {
+  size_t i;
+
+  wclear(self->window);
+
+  if(num_friends == 0) {
+    wprintw(self->window, "Empty. Add some friends! :-)\n");
+  }
+  else {
+    wattron(self->window, COLOR_PAIR(2) | A_BOLD);
+    wprintw(self->window, "Open chat with.. (up/down keys, enter)\n");
+    wattroff(self->window, COLOR_PAIR(2) | A_BOLD);
+  }
+
+  wprintw(self->window, "\n");
+
+  for(i=0; i<num_friends; i++) {
+
+    if(i == num_selected) wattron(self->window, COLOR_PAIR(3));
+    wprintw(self->window, "  [#%d] ", friends[i].num);
+    if(i == num_selected) wattroff(self->window, COLOR_PAIR(3));
+
+    attron(A_BOLD);
+    wprintw(self->window, "%s ", friends[i].name);
+    attroff(A_BOLD);
+
+    wprintw(self->window, "(%s)\n", friends[i].status);
+  }
+
+  wrefresh(self->window);
+}
+
+static void friendlist_onInit(ToxWindow* self) {
+
+}
+
+
+ToxWindow new_friendlist() {
+  ToxWindow ret;
+
+  memset(&ret, 0, sizeof(ret));
+
+  ret.onKey = &friendlist_onKey;
+  ret.onDraw = &friendlist_onDraw;
+  ret.onInit = &friendlist_onInit;
+  ret.onMessage = &friendlist_onMessage;
+  ret.onNickChange = &friendlist_onNickChange;
+  ret.onStatusChange = &friendlist_onStatusChange;
+  strcpy(ret.title, "[friends]");
+
+  return ret;
+}
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 0aad6777..fffc3f84 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -14,6 +14,10 @@
 #include "windows.h"
 
 extern ToxWindow new_prompt();
+extern ToxWindow new_friendlist();
+
+extern int friendlist_onFriendAdded(int num);
+
 extern int add_req(uint8_t* public_key); // XXX
 
 #define TOXWINDOWS_MAX_NUM 32
@@ -25,21 +29,59 @@ static ToxWindow* prompt;
 
 // CALLBACKS START
 void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) {
+  size_t i;
   int n = add_req(public_key);
 
-  wprintw(prompt->window, "\nFriend request.\nUse \"accept %d\" to accept it.\n", n);
+  wprintw(prompt->window, "\nFriend request from:\n");
+
+  for(i=0; i<32; i++) {
+    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
+  }
+  wprintw(prompt->window, "\n");
+
+  wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n);
+
+  for(i=0; i<w_num; i++) {
+    if(windows[i].onFriendRequest != NULL)
+      windows[i].onFriendRequest(&windows[i], public_key, data, length);
+  }
 }
 
 void on_message(int friendnumber, uint8_t* string, uint16_t length) {
+  size_t i;
+
   wprintw(prompt->window, "\n(message) %d: %s!\n", friendnumber, string);
+
+  for(i=0; i<w_num; i++) {
+    if(windows[i].onMessage != NULL)
+      windows[i].onMessage(&windows[i], friendnumber, string, length);
+  }
 }
 
 void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) {
-  wprintw(prompt->window, "\n(nick) %d: %s!\n", friendnumber, string);
+  size_t i;
+
+  wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
+
+  for(i=0; i<w_num; i++) {
+    if(windows[i].onNickChange != NULL)
+      windows[i].onNickChange(&windows[i], friendnumber, string, length);
+  }
 }
 
 void on_statuschange(int friendnumber, uint8_t* string, uint16_t length) {
-  wprintw(prompt->window, "\n(status) %d: %s!\n", friendnumber, string);
+  size_t i;
+
+  wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string);
+
+  for(i=0; i<w_num; i++) {
+    if(windows[i].onStatusChange != NULL)
+      windows[i].onStatusChange(&windows[i], friendnumber, string, length);
+  }
+}
+
+void on_friendadded(int friendnumber) {
+  friendlist_onFriendAdded(friendnumber);
 }
 // CALLBACKS END
 
@@ -73,7 +115,7 @@ static void init_tox() {
   m_callback_userstatus(on_statuschange);
 }
 
-static int add_window(ToxWindow w) {
+int add_window(ToxWindow w) {
   if(w_num == TOXWINDOWS_MAX_NUM)
     return -1;
 
@@ -88,14 +130,22 @@ static int add_window(ToxWindow w) {
   windows[w_num++] = w;
   w.onInit(&w);
 
-  return w_num;
+  return w_num - 1;
+}
+
+int focus_window(int num) {
+  if(num >= w_num || num < 0)
+    return -1;
+
+  w_active = num;
+  return 0;
 }
 
 static void init_windows() {
   w_num = 0;
   w_active = 0;
 
-  if(add_window(new_prompt()) == -1) {
+  if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) {
     fprintf(stderr, "add_window() failed.\n");
 
     endwin();
@@ -134,14 +184,18 @@ static void load_data() {
 
     if(buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
+
       fclose(fd);
+      endwin();
       exit(1);
     }
 
     if(fread(buf, len, 1, fd) != 1){
       fprintf(stderr, "fread() failed.\n");
+
       free(buf);
       fclose(fd);
+      endwin();
       exit(1);
     }
 
@@ -153,6 +207,7 @@ static void load_data() {
 
     if(buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
+      endwin();
       exit(1);
     }
 
@@ -161,14 +216,18 @@ static void load_data() {
     fd = fopen("data", "w");
     if(fd == NULL) {
       fprintf(stderr, "fopen() failed.\n");
+
       free(buf);
+      endwin();
       exit(1);
     }
 
     if(fwrite(buf, len, 1, fd) != 1){
       fprintf(stderr, "fwrite() failed.\n");
+
       free(buf);
       fclose(fd);
+      endwin();
       exit(1);
     }
   }
@@ -178,6 +237,7 @@ static void load_data() {
 }
 
 static void draw_bar() {
+  static int odd = 0;
   size_t i;
 
   attron(COLOR_PAIR(4));
@@ -186,12 +246,26 @@ static void draw_bar() {
 
   move(LINES - 1, 0);
 
+  attron(COLOR_PAIR(4) | A_BOLD);
+  printw(" TOXIC 1.0 |");
+  attroff(COLOR_PAIR(4) | A_BOLD);
+
   for(i=0; i<w_num; i++) {
     if(i == w_active) {
       attron(A_BOLD);
     }
 
-    printw(" %s ", windows[i].title);
+    odd = (odd+1) % 2;
+
+    if(windows[i].blink && odd) {
+      attron(COLOR_PAIR(3));
+    }
+
+    printw(" %s", windows[i].title);
+
+    if(windows[i].blink && odd) {
+      attron(COLOR_PAIR(3));
+    }
 
     if(i == w_active) {
       attroff(A_BOLD);
@@ -201,6 +275,11 @@ static void draw_bar() {
   refresh();
 }
 
+void prepare_window(WINDOW* w) {
+  mvwin(w, 0, 0);
+  wresize(w, LINES-2, COLS);
+}
+
 int main(int argc, char* argv[]) {
   int ch;
   ToxWindow* a;
@@ -211,14 +290,22 @@ int main(int argc, char* argv[]) {
   init_windows();
 
   while(true) {
+    // Update tox.
     do_tox();
 
+    // Draw.
     a = &windows[w_active];
+    prepare_window(a->window);
+    a->blink = false;
     a->onDraw(a);
     draw_bar();
 
+    // Handle input.
     ch = getch();
-    if(ch != ERR) {
+    if(ch == '\t') {
+      w_active = (w_active + 1) % w_num;
+    }
+    else if(ch != ERR) {
       a->onKey(a, ch);
     }
 
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 4a59cc7b..f1b6e689 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -15,6 +15,8 @@
 uint8_t pending_requests[256][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
 
+extern void on_friendadded(int friendnumber);
+
 // XXX:
 int add_req(uint8_t* public_key) {
   memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
@@ -40,8 +42,7 @@ static int prompt_buf_pos=0;
 
 static void execute(ToxWindow* self, char* cmd) {
 
-  // quit/exit: Exit program.
-  if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit")) {
+  if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
     endwin();
     exit(0);
   }
@@ -53,33 +54,32 @@ static void execute(ToxWindow* self, char* cmd) {
 
     ip = strchr(cmd, ' ');
     if(ip == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     ip++;
 
     port = strchr(ip, ' ');
     if(port == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     port[0] = 0;
     port++;
 
     key = strchr(port, ' ');
     if(key == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     key[0] = 0;
     key++;
 
     if(atoi(port) == 0) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
-    wprintw(self->window, "ip=%s, port=%s, key=%s\n", ip, port, key);
-
     dht.port = htons(atoi(port));
 
     int resolved_address = resolve_addr(ip);
@@ -91,38 +91,62 @@ static void execute(ToxWindow* self, char* cmd) {
     DHT_bootstrap(dht, hex_string_to_bin(key));
   }
   else if(!strncmp(cmd, "add ", strlen("add "))) {
+    uint8_t id_bin[32];
+    size_t i;
+    char xx[3];
+    uint32_t x;
+
     char* id;
     char* msg;
     int num;
 
     id = strchr(cmd, ' ');
-
     if(id == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     id++;
 
     msg = strchr(id, ' ');
-    if(msg == NULL) {
+    if(msg != NULL) {
+      msg[0] = 0;
+      msg++;
+    }
+    else msg = "";
+
+    if(strlen(id) != 2*32) {
+      wprintw(self->window, "Invalid ID length.\n");
       return;
     }
 
-    msg[0] = 0;
-    msg++;
+    for(i=0; i<32; i++) {
+      xx[0] = id[2*i];
+      xx[1] = id[2*i+1];
+      xx[2] = '\0';
+
+      if(sscanf(xx, "%02x", &x) != 1) {
+        wprintw(self->window, "Invalid ID.\n");
+        return;
+      }
+
+      id_bin[i] = x;
+    }
+
+    num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
 
-    num = m_addfriend((uint8_t*) id, (uint8_t*) msg, strlen(msg)+1);
     wprintw(self->window, "Friend added as %d.\n", num);
+    on_friendadded(num);
   }
   else if(!strncmp(cmd, "status ", strlen("status "))) {
     char* msg;
 
     msg = strchr(cmd, ' ');
     if(msg == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     msg++;
+
     m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
     wprintw(self->window, "Status set to: %s.\n", msg);
   }
@@ -133,33 +157,22 @@ static void execute(ToxWindow* self, char* cmd) {
     if(nick == NULL) {
       return;
     }
-
     nick++;
+
     setname((uint8_t*) nick, strlen(nick)+1);
     wprintw(self->window, "Nickname set to: %s.\n", nick);
   }
   else if(!strcmp(cmd, "myid")) {
-    // XXX: Clean this up
-    char idstring0[200];
-    char idstring1[32][5];
-    char idstring2[32][5];
-    uint32_t i;
-
-    for(i = 0; i < 32; i++) {
-      if(self_public_key[i] < 16)
-        strcpy(idstring1[i], "0");
-      else 
-        strcpy(idstring1[i], "");
-
-      sprintf(idstring2[i], "%hhX", self_public_key[i]);
+    char id[32*2 + 1] = {0};
+    size_t i;
+
+    for(i=0; i<32; i++) {
+      char xx[3];
+      snprintf(xx, sizeof(xx), "%02x",  self_public_key[i] & 0xff);
+      strcat(id, xx);
     }
     
-    for (i=0; i<32; i++) {
-      strcat(idstring0, idstring1[i]);
-      strcat(idstring0, idstring2[i]);
-    }
-
-    wprintw(self->window, "%s\n", idstring0);
+    wprintw(self->window, "%s\n", id);
   }
   else if(!strncmp(cmd, "accept ", strlen("accept "))) {
     char* id;
@@ -167,17 +180,26 @@ static void execute(ToxWindow* self, char* cmd) {
 
     id = strchr(cmd, ' ');
     if(id == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     id++;
-   
+
     num = atoi(id);
     if(num >= num_requests) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
     num = m_addfriend_norequest(pending_requests[num]);
-    wprintw(self->window, "Friend accepted as: %d.\n", num);
+
+    if(num == -1) {
+      wprintw(self->window, "Failed to add friend.\n");
+    }
+    else {
+      wprintw(self->window, "Friend accepted as: %d.\n", num);
+      on_friendadded(num);
+    }
   }
   else if(!strncmp(cmd, "msg ", strlen("msg "))) {
     char* id;
@@ -186,26 +208,29 @@ static void execute(ToxWindow* self, char* cmd) {
     id = strchr(cmd, ' ');
 
     if(id == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     id++;
 
     msg = strchr(id, ' ');
     if(msg == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-
     msg[0] = 0;
     msg++;
 
-    if(m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) != 1) {
+    if(m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0) {
       wprintw(self->window, "Error occurred while sending message.\n");
     }
     else {
       wprintw(self->window, "Message successfully sent.\n");
     }
   }
+  else {
+    wprintw(self->window, "Invalid syntax.\n");
+  }
 }
 
 static void prompt_onKey(ToxWindow* self, int key) {
@@ -231,7 +256,7 @@ static void prompt_onKey(ToxWindow* self, int key) {
   }
 
   // BACKSPACE key: Remove one character from line.
-  else if(key == 0x107) {
+  else if(key == 0x107 || key == 0x8 || key == 0x7f) {
 
     if(prompt_buf_pos != 0) {
       prompt_buf[--prompt_buf_pos] = 0;
@@ -242,9 +267,6 @@ static void prompt_onKey(ToxWindow* self, int key) {
 static void prompt_onDraw(ToxWindow* self) {
   int x, y;
 
-  mvwin(self->window,0,0);
-  wresize(self->window, LINES-2, COLS);
-
   getyx(self->window, y, x);
   (void) x;
 
@@ -260,7 +282,7 @@ static void prompt_onDraw(ToxWindow* self) {
 
 static void print_usage(ToxWindow* self) {
   wattron(self->window, COLOR_PAIR(2) | A_BOLD);
-  wprintw(self->window, "Usage:\n");
+  wprintw(self->window, "Commands:\n");
   wattroff(self->window, A_BOLD);
   
   wprintw(self->window, "      connect <ip> <port> <key> : Connect to DHT server\n");
@@ -270,6 +292,12 @@ static void print_usage(ToxWindow* self) {
   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));
 }
 
@@ -283,6 +311,8 @@ static void prompt_onInit(ToxWindow* self) {
 ToxWindow new_prompt() {
   ToxWindow ret;
 
+  memset(&ret, 0, sizeof(ret));
+
   ret.onKey = &prompt_onKey;
   ret.onDraw = &prompt_onDraw;
   ret.onInit = &prompt_onInit;
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index 2e082ca9..dde1430f 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -1,10 +1,23 @@
+/*
+ * Toxic -- Tox Curses Client
+ */
+
+#include <stdbool.h>
+
 typedef struct ToxWindow_ ToxWindow;
 
 struct ToxWindow_ {
   void(*onKey)(ToxWindow*, int);
   void(*onDraw)(ToxWindow*);
   void(*onInit)(ToxWindow*);
+  void(*onFriendRequest)(ToxWindow*, uint8_t*, uint8_t*, uint16_t);
+  void(*onMessage)(ToxWindow*, int, uint8_t*, uint16_t);
+  void(*onNickChange)(ToxWindow*, int, uint8_t*, uint16_t);
+  void(*onStatusChange)(ToxWindow*, int, uint8_t*, uint16_t);
   char title[256];
 
+  void* x;
+  bool blink;
+
   WINDOW* window;
 };