8 files changed, 600 insertions, 385 deletions

diff --git a/testing/misc_tools.c b/testing/misc_tools.c
index aa546a88..fa7f42c9 100644
--- a/testing/misc_tools.c
+++ b/testing/misc_tools.c
@@ -25,7 +25,11 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <stdio.h> /* for sscanf */
+#include <stdio.h>
+
+#ifdef DEBUG
+#include <assert.h>
+#endif // DEBUG
 
 /* TODO: rewrite */
 unsigned char * hex_string_to_bin(char hex_string[])
@@ -39,3 +43,9 @@ unsigned char * hex_string_to_bin(char hex_string[])
 
     return val;
 }
+
+
+
+
+
+
diff --git a/testing/misc_tools.h b/testing/misc_tools.h
index 5079e15d..eb09693e 100644
--- a/testing/misc_tools.h
+++ b/testing/misc_tools.h
@@ -25,5 +25,145 @@
 #define MISC_TOOLS_H
 
 unsigned char * hex_string_to_bin(char hex_string[]);
- 
+
+/* WARNING(msg) takes a printf()-styled string and prints it
+ * with some additional details.
+ * ERROR(exit_status, msg) does the same thing as WARNING(), but
+ * also exits the program with the given exit status.
+ * Examples:
+ * WARNING("<insert warning message here>");
+ * int exit_status = 2;
+ * ERROR(exit_status, "exiting with status %i", exit_status);
+ */
+#ifdef DEBUG
+    #include <assert.h>
+    #include <stdio.h>
+    #include <string.h>
+
+    #define DEBUG_PRINT(str, ...) do { \
+        char msg[1000]; \
+        sprintf(msg, "%s(): line %d (file %s): %s%%c\n", __FUNCTION__, __LINE__, __FILE__, str); \
+        fprintf(stderr, msg, __VA_ARGS__); \
+    } while (0)
+
+    #define WARNING(...) do { \
+        fprintf(stderr, "warning in "); \
+        DEBUG_PRINT(__VA_ARGS__, ' '); \
+    } while (0)
+
+    #define ERROR(exit_status, ...) do { \
+        fprintf(stderr, "error in "); \
+        DEBUG_PRINT(__VA_ARGS__, ' '); \
+        exit(exit_status); \
+    } while (0)
+#else
+    #define WARNING(...)
+    #define ERROR(...)
+#endif // DEBUG
+
+/************************Linked List***********************
+ * This is a simple linked list implementation, very similar
+ * to Linux kernel's /include/linux/list.h (which we can't 
+ * use because Tox is GPLv3 and Linux is GPLv2.)
+ *
+ * TODO: Make the lists easier to use with some sweat pre-
+ * processor syntactic sugar.
+ **********************************************************/
+
+/* Example usage
+
+This sample program makes a new struct which contains a
+character and a tox_list_t. It then prompts a user for
+input until he enters q or e. It then adds each character
+to the list, and uses a special for loop to print them.
+It then removes all the 'z' characters, and prints the list
+again.
+
+//Notice that the data to be put in the list *contains* tox_list_t;
+//usually, this is the other way around!
+typedef struct tox_string {
+   char c;
+   tox_list_t tox_lst; //Notice that tox_lst is *NOT* a pointer.
+} tox_string_t;
+
+int main()
+{
+   tox_list_t head;
+   tox_list_new(&head); //initialize head
+   
+   //input a new character, until user enters q or e
+   char c = '\0';
+   while (c != 'q' && c != 'e') {
+      scanf("%c", &c);
+      tox_string_t* tmp = malloc(sizeof(tox_string_t));
+      tmp->c = c;
+      tox_list_add(&head, &tmp->tox_lst); //add it to the list
+   }
+   
+TOX_LIST_FOR_EACH() takes a struct tox_list and a name for a temporary pointer to use in the loop.
+   
+TOX_LIST_GET_VALUE() uses magic to return an instance of a structure that contains tox_list_t.
+You have to give it a temporary tox_string_t, name of tox_list_t member inside our structure (tox_lst),
+and the type of structure to return.
+   
+   TOX_LIST_FOR_EACH(head, tmp)
+      printf("%c", TOX_LIST_GET_VALUE(*tmp, tox_lst, tox_string_t).c);
+   
+   TOX_LIST_FOR_EACH(head, tmp) {
+      if (TOX_LIST_GET_VALUE(*tmp, tox_lst, tox_string_t).c == 'z') {
+         //If you delete tmp, you have to quit the loop, or it will go on infinitly.
+         //This will be fixed later on.
+         tox_list_remove(tmp);
+         break;
+      }
+   }
+   
+   printf("\n");
+   TOX_LIST_FOR_EACH(head, tmp)
+      printf("%c", TOX_LIST_GET_VALUE(*tmp, tox_lst, tox_string_t).c);
+   
+   
+   return 0;
+}
+*/
+
+#define MEMBER_OFFSET(var_name_in_parent, parent_type) \
+   (&(((parent_type*)0)->var_name_in_parent))
+
+#define GET_PARENT(var, var_name_in_parent, parent_type) \
+   (*((parent_type*)((uint64_t)(&(var)) - (uint64_t)(MEMBER_OFFSET(var_name_in_parent, parent_type)))))
+
+#define TOX_LIST_FOR_EACH(lst, tmp_name) \
+   for (tox_list_t* tmp_name = lst.next; tmp_name != &lst; tmp_name = tmp_name->next)
+
+#define TOX_LIST_GET_VALUE(tmp_name, name_in_parent, parent_type) GET_PARENT(tmp_name, name_in_parent, parent_type)
+
+typedef struct tox_list {
+   struct tox_list *prev, *next;
+} tox_list_t;
+
+/* Returns a new tox_list_t. */
+static inline void tox_list_new(tox_list_t* lst) {
+   lst->prev = lst->next = lst;
+}
+      
+/* Inserts a new tox_lst after lst and returns it. */
+static inline void tox_list_add(tox_list_t* lst, tox_list_t* new_lst) {
+   tox_list_new(new_lst);
+
+   new_lst->next = lst->next;
+   new_lst->next->prev = new_lst;
+
+   lst->next = new_lst;
+   new_lst->prev = lst;
+}
+
+static inline void tox_list_remove(tox_list_t* lst) {
+#ifdef DEBUG /* TODO: check how debugging is done in Tox. */
+   assert(lst->next != lst && lst->prev != lst);
+#endif
+   lst->prev->next = lst->next;
+   lst->next->prev = lst->prev;
+}
+
 #endif // MISC_TOOLS_H
diff --git a/testing/nTox.c b/testing/nTox.c
index 63d0c32e..ecdba1e3 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -410,6 +410,8 @@ void load_key(char *path)
         }
     }
 
+    if(fclose(data_file) < 0)
+        perror("[!] fclose failed");
     return;
 
 FILE_ERROR:
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index da1f9f4a..20c01620 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -16,41 +16,39 @@
 
 typedef struct {
   int friendnum;
-
   char line[256];
   size_t pos;
-
   WINDOW* history;
   WINDOW* linewin;
-
 } ChatContext;
 
-extern void fix_name(uint8_t* name);
-void print_help(ChatContext* self);
-void execute(ToxWindow* self, ChatContext* ctx, char* cmd);
+extern int active_window;
 
-static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) {
-  ChatContext* ctx = (ChatContext*) self->x;
+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, char *cmd);
+
+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};
-  
   time_t now;
   time(&now);
   struct tm * timeinfo;
   timeinfo = localtime(&now);
 
-  if(ctx->friendnum != num)
+  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(2));
-  wprintw(ctx->history, "%02d:%02d:%02d  ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+  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));
   wprintw(ctx->history, "%s: ", nick);
@@ -62,15 +60,14 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
   flash();
 }
 
-static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t len) {
-  ChatContext* ctx = (ChatContext*) self->x;
-
-  if(ctx->friendnum != num)
+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);
-
   snprintf(self->title, sizeof(self->title), "[%s (%d)]", nick, num);
 
   wattron(ctx->history, COLOR_PAIR(3));
@@ -78,7 +75,8 @@ static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t
   wattroff(ctx->history, COLOR_PAIR(3));
 }
 
-static void chat_onStatusChange(ToxWindow* self, int num, uint8_t* status, uint16_t len) {
+static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint16_t len)
+{
 
 }
 
@@ -87,45 +85,43 @@ int string_is_empty(char *string)
 {
   int rc = 0;
   char *copy = strdup(string);
-
   rc = ((strtok(copy, " ") == NULL) ? 1:0);
   free(copy);
-
   return rc;
 }
 
-static void chat_onKey(ToxWindow* self, int key) {
-  ChatContext* ctx = (ChatContext*) self->x;
-
+static void chat_onKey(ToxWindow *self, int key)
+{
+  ChatContext *ctx = (ChatContext*) self->x;
   time_t now;
   time(&now);
   struct tm * timeinfo;
   timeinfo = localtime(&now);
 
-  /* PRINTABLE characters: Add to line */
-  if(isprint(key)) {
-    if(ctx->pos != sizeof(ctx->line)-1) {
+  /* Add printable characters to line */
+  if (isprint(key)) {
+    if (ctx->pos != sizeof(ctx->line)-1) {
       ctx->line[ctx->pos++] = key;
       ctx->line[ctx->pos] = '\0';
     }
   }
 
   /* RETURN key: Execute command or print line */
-  else if(key == '\n') {
+  else if (key == '\n') {
     if (ctx->line[0] == '/')
       execute(self, ctx, ctx->line);
     else {
-      if(!string_is_empty(ctx->line)) {
+      if (!string_is_empty(ctx->line)) {
         /* make sure the string has at least non-space character */
         wattron(ctx->history, COLOR_PAIR(2));
-        wprintw(ctx->history, "%02d:%02d:%02d ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec);
+        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);
         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) {
+      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));
@@ -136,29 +132,32 @@ static void chat_onKey(ToxWindow* self, int key) {
   }
 
   /* BACKSPACE key: Remove one character from line */
-  else if(key == 0x107 || key == 0x8 || key == 0x7f) {
-    if(ctx->pos != 0) {
+  else if (key == 0x107 || key == 0x8 || key == 0x7f) {
+    if (ctx->pos != 0) {
       ctx->line[--ctx->pos] = '\0';
     }
   }
 }
 
-void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
+void execute(ToxWindow *self, ChatContext *ctx, char *cmd)
 {
   if (!strcmp(cmd, "/clear") || !strcmp(cmd, "/c")) {
     wclear(self->window);
     wclear(ctx->history);
   }
+
   else if (!strcmp(cmd, "/help") || !strcmp(cmd, "/h"))
     print_help(ctx);
+
   else if (!strcmp(cmd, "/quit") || !strcmp(cmd, "/exit") || !strcmp(cmd, "/q")) {
     endwin();
     exit(0);
   }
+
   else if (!strncmp(cmd, "/status ", strlen("/status "))) {
-    char* msg;
+    char *msg;
     msg = strchr(cmd, ' ');
-    if(msg == NULL) {
+    if (msg == NULL) {
       wprintw(ctx->history, "Invalid syntax.\n");
       return;
     }
@@ -166,10 +165,11 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
     m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
     wprintw(ctx->history, "Status set to: %s\n", msg);
   }
+
   else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {
-    char* nick;
+    char *nick;
     nick = strchr(cmd, ' ');
-    if(nick == NULL) {
+    if (nick == NULL) {
       wprintw(ctx->history, "Invalid syntax.\n");
       return;
     }
@@ -177,7 +177,8 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
     setname((uint8_t*) nick, strlen(nick)+1);
     wprintw(ctx->history, "Nickname set to: %s\n", nick);
   }
-  else if(!strcmp(cmd, "/myid")) {
+
+  else if (!strcmp(cmd, "/myid")) {
     char id[32*2 + 1] = {0};
     int i;
     for (i = 0; i < 32; i++) {
@@ -187,58 +188,64 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
     }
     wprintw(ctx->history, "Your ID: %s\n", id);
   }
+
+  else if (strcmp(ctx->line, "/close") == 0) {
+    active_window = 0;    // Go to prompt screen
+    int f_num = ctx->friendnum;
+    delwin(ctx->linewin);
+    del_window(self, f_num);
+  }
+
   else
     wprintw(ctx->history, "Invalid command.\n");
 }
 
-static void chat_onDraw(ToxWindow* self) {
+static void chat_onDraw(ToxWindow *self)
+{
   curs_set(1);
   int x, y;
-  ChatContext* ctx = (ChatContext*) self->x;
-
+  ChatContext *ctx = (ChatContext*) self->x;
   getmaxyx(self->window, y, x);
-
   (void) x;
-  if(y < 3)
-    return;
+  if (y < 3) return;
 
   wclear(ctx->linewin);
   mvwhline(ctx->linewin, 0, 0, '_', COLS);
   mvwprintw(self->window, y-1, 0, "%s\n", ctx->line);
-
   wrefresh(self->window);
 }
 
-static void chat_onInit(ToxWindow* self) {
+static void chat_onInit(ToxWindow *self)
+{
   int x, y;
-  ChatContext* ctx = (ChatContext*) self->x;
-
+  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);
+  print_help(ctx);
 }
 
-void print_help(ChatContext* self) {
+void print_help(ChatContext *self)
+{
   wattron(self->history, COLOR_PAIR(2) | A_BOLD);
-  wprintw(self->history, "\nCommands:\n");
+  wprintw(self->history, "Commands:\n");
   wattroff(self->history, A_BOLD);
   
   wprintw(self->history, "      /status <message>          : Set your status\n");
   wprintw(self->history, "      /nick <nickname>           : Set your nickname\n");
   wprintw(self->history, "      /myid                      : Print your ID\n");
   wprintw(self->history, "      /clear                     : Clear the screen\n");
+  wprintw(self->history, "      /close                     : Close the current chat window\n");
   wprintw(self->history, "      /quit or /exit             : Exit program\n");
   wprintw(self->history, "      /help                      : Print this message again\n\n");
 
   wattroff(self->history, COLOR_PAIR(2));
 }
 
-ToxWindow new_chat(int friendnum) {
+ToxWindow new_chat(int friendnum)
+{
   ToxWindow ret;
-
   memset(&ret, 0, sizeof(ret));
 
   ret.onKey = &chat_onKey;
@@ -254,9 +261,8 @@ ToxWindow new_chat(int friendnum) {
 
   snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum);
 
-  ChatContext* x = calloc(1, sizeof(ChatContext));
+  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
index 05651b0e..f03914e6 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -12,54 +12,59 @@
 
 #include "windows.h"
 
-extern int add_window(ToxWindow w);
-extern int focus_window(int num);
+extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM];
+extern int add_window(ToxWindow w, int n);
 extern ToxWindow new_chat(int friendnum);
 
-#define MAX_FRIENDS_NUM 100
+extern int active_window;
 
 typedef struct {
   uint8_t name[MAX_NAME_LENGTH];
   uint8_t status[MAX_USERSTATUS_LENGTH];
-  int     num;
-  int     chatwin;
+  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;
-
+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)) {
+    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)
+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));
+  if (friends[num].chatwin == -1) {
+    friends[num].chatwin = num;
+    int i;
+    /* Find first open slot to hold chat window */
+    for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+      if (WINDOW_STATUS[i] == -1) {
+        WINDOW_STATUS[i] = num;
+        add_window(new_chat(num), i);
+        active_window = i;
+        break;
+      }
+    }
   }
 }
 
-void friendlist_onNickChange(ToxWindow* self, int num, uint8_t* str, uint16_t len) {
-
-  if(len >= MAX_NAME_LENGTH || num >= num_friends)
+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);
@@ -67,9 +72,9 @@ void friendlist_onNickChange(ToxWindow* self, int num, uint8_t* str, uint16_t le
   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)
+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);
@@ -77,48 +82,59 @@ void friendlist_onStatusChange(ToxWindow* self, int num, uint8_t* str, uint16_t
   fix_name(friends[num].status);
 }
 
-int friendlist_onFriendAdded(int num) {
-
-  if(num_friends == MAX_FRIENDS_NUM)
+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++;
+  friends[num_friends++].chatwin = -1;
   return 0;
 }
 
-static void friendlist_onKey(ToxWindow* self, int key) {
-
-  if(key == KEY_UP) {
-    if(num_selected != 0)
-      num_selected--;
+static void friendlist_onKey(ToxWindow *self, int key)
+{
+  if (key == KEY_UP) {
+    if (--num_selected < 0)
+      num_selected = num_friends-1;
   }
-  else if(key == KEY_DOWN) {
-    if(num_friends != 0)
+  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);
+  else if (key == '\n') {
+    /* Jump to chat window if already open */
+    if (friends[num_selected].chatwin != -1) {
+      int i;
+      for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+        if (WINDOW_STATUS[i] == num_selected) {
+          active_window = i;
+          break;
+        }
+      }
+    }else {
+      int i;
+      for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+        if (WINDOW_STATUS[i] == -1) {
+          WINDOW_STATUS[i] = num_selected;
+          friends[num_selected].chatwin = num_selected;
+          add_window(new_chat(num_selected), i);
+          active_window = i;
+          break;
+        }
+      }
+    }
   }
 }
 
-static void friendlist_onDraw(ToxWindow* self) {
+static void friendlist_onDraw(ToxWindow *self)
+{
   curs_set(0);
-  size_t i;
-
   werase(self->window);
-
-  if(num_friends == 0) {
+  if (num_friends == 0) {
     wprintw(self->window, "Empty. Add some friends! :-)\n");
   }
   else {
@@ -128,12 +144,11 @@ static void friendlist_onDraw(ToxWindow* self) {
   }
 
   wprintw(self->window, "\n");
-
-  for(i=0; i<num_friends; i++) {
-
-    if(i == num_selected) wattron(self->window, COLOR_PAIR(3));
+  int i;
+  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));
+    if (i == num_selected) wattroff(self->window, COLOR_PAIR(3));
 
     attron(A_BOLD);
     wprintw(self->window, "%s ", friends[i].name);
@@ -141,18 +156,21 @@ static void friendlist_onDraw(ToxWindow* self) {
 
     wprintw(self->window, "(%s)\n", friends[i].status);
   }
-
   wrefresh(self->window);
 }
 
-static void friendlist_onInit(ToxWindow* self) {
-
+void disable_chatwin(int f_num)
+{
+  friends[f_num].chatwin = -1;
 }
 
+static void friendlist_onInit(ToxWindow *self) 
+{
+
+}
 
 ToxWindow new_friendlist() {
   ToxWindow ret;
-
   memset(&ret, 0, sizeof(ret));
 
   ret.onKey = &friendlist_onKey;
@@ -161,7 +179,7 @@ ToxWindow new_friendlist() {
   ret.onMessage = &friendlist_onMessage;
   ret.onNickChange = &friendlist_onNickChange;
   ret.onStatusChange = &friendlist_onStatusChange;
-  strcpy(ret.title, "[friends]");
 
+  strcpy(ret.title, "[friends]");
   return ret;
 }
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index ee5e9f2a..1ba8b6c9 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -17,228 +17,238 @@ extern ToxWindow new_prompt();
 extern ToxWindow new_friendlist();
 
 extern int friendlist_onFriendAdded(int num);
+extern void disable_chatwin(int f_num);
+extern int add_req(uint8_t *public_key); // XXX
 
-extern int add_req(uint8_t* public_key); // XXX
+/* Holds status of chat windows */
+char WINDOW_STATUS[MAX_WINDOW_SLOTS];
 
-#define TOXWINDOWS_MAX_NUM 32
-
-static ToxWindow windows[TOXWINDOWS_MAX_NUM];
-static int w_num;
-static int w_active;
+static ToxWindow windows[MAX_WINDOW_SLOTS];
 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);
+int w_num;
+int active_window;
 
+/* CALLBACKS START */
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
+{
+  int n = add_req(public_key);
   wprintw(prompt->window, "\nFriend request from:\n");
 
-  for(i=0; i<32; i++) {
+  int i;
+  for (i = 0; i < 32; ++i) {
     wprintw(prompt->window, "%02x", public_key[i] & 0xff);
   }
-  wprintw(prompt->window, "\n");
 
+  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)
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++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;
-
+void on_message(int friendnumber, uint8_t *string, uint16_t length)
+{
   wprintw(prompt->window, "\n(message) %d: %s\n", friendnumber, string);
-
-  for(i=0; i<w_num; i++) {
-    if(windows[i].onMessage != NULL)
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++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) {
-  size_t i;
-
+void on_nickchange(int friendnumber, uint8_t *string, uint16_t length)
+{
   wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
-
-  for(i=0; i<w_num; i++) {
-    if(windows[i].onNickChange != NULL)
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onNickChange != NULL)
       windows[i].onNickChange(&windows[i], friendnumber, string, length);
   }
 }
 
-void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) {
-  size_t i;
-
+void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
+{
   wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
-
-  for(i=0; i<w_num; i++) {
-    if(windows[i].onStatusChange != NULL)
+  int i;
+  for (i=0; i<MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onStatusChange != NULL)
       windows[i].onStatusChange(&windows[i], friendnumber, string, length);
   }
 }
 
-void on_friendadded(int friendnumber) {
+void on_friendadded(int friendnumber)
+{
   friendlist_onFriendAdded(friendnumber);
 }
-// CALLBACKS END
+/* CALLBACKS END */
 
-static void init_term() {
-  // Setup terminal.
+static void init_term()
+{
+  /* Setup terminal */
   initscr();
   cbreak();
   keypad(stdscr, 1);
   noecho();
   timeout(100);
 
-  if(has_colors()) {
+  if (has_colors()) {
     start_color();
     init_pair(1, COLOR_GREEN, COLOR_BLACK);
     init_pair(2, COLOR_CYAN, COLOR_BLACK);
     init_pair(3, COLOR_RED, COLOR_BLACK);
     init_pair(4, COLOR_BLUE, COLOR_BLACK);
   }
-
   refresh();
 }
 
-static void init_tox() {
-  // Init core.
+static void init_tox()
+{
+  /* Init core */
   initMessenger();
 
-  // Callbacks.
+  /* Callbacks */
   m_callback_friendrequest(on_request);
   m_callback_friendmessage(on_message);
   m_callback_namechange(on_nickchange);
   m_callback_userstatus(on_statuschange);
 }
 
-int add_window(ToxWindow w) {
-  if(w_num == TOXWINDOWS_MAX_NUM)
+void init_window_status()
+{
+  /* Default window values decrement from -2 */
+  int i;
+  for (i = 0; i < N_DEFAULT_WINS; ++i)
+    WINDOW_STATUS[i] = -(i+2);
+
+  int j;
+  for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
+    WINDOW_STATUS[j] = -1;
+}
+
+int add_window(ToxWindow w, int n)
+{
+  if (w_num >= TOXWINDOWS_MAX_NUM)
     return -1;
 
-  if(LINES < 2)
+  if (LINES < 2)
     return -1;
 
   w.window = newwin(LINES - 2, COLS, 0, 0);
-
-  if(w.window == NULL)
+  if (w.window == NULL)
     return -1;
 
-  windows[w_num++] = w;
+  windows[n] = w;
   w.onInit(&w);
-
-  return w_num - 1;
+  w_num++;
+  return n;
 }
 
-int focus_window(int num) {
-  if(num >= w_num || num < 0)
-    return -1;
-
-  w_active = num;
-  return 0;
+/* Deletes window w and cleans up */
+void del_window(ToxWindow *w, int f_num)
+{
+  delwin(w->window);
+  int i;
+  for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
+    if (WINDOW_STATUS[i] == f_num) {
+      WINDOW_STATUS[i] = -1;
+      disable_chatwin(f_num);
+      break;
+    }
+  }
+  clear();
+  refresh();
 }
 
-static void init_windows() {
+static void init_windows()
+{
   w_num = 0;
-  w_active = 0;
-
-  if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) {
+  int n_prompt = 0;
+  int n_friendslist = 1;
+  if (add_window(new_prompt(), n_prompt) == -1 
+                        || add_window(new_friendlist(), n_friendslist) == -1) {
     fprintf(stderr, "add_window() failed.\n");
-
     endwin();
     exit(1);
   }
-
-  prompt = &windows[0];
+  prompt = &windows[n_prompt];
 }
 
-static void do_tox() {
+static void do_tox()
+{
   static bool dht_on = false;
-
-  if(!dht_on && DHT_isconnected()) {
+  if (!dht_on && DHT_isconnected()) {
     dht_on = true;
     wprintw(prompt->window, "\nDHT connected!\n");
   }
-  else if(dht_on && !DHT_isconnected()) {
+  else if (dht_on && !DHT_isconnected()) {
     dht_on = false;
     wprintw(prompt->window, "\nDHT disconnected!\n");
   }
-
   doMessenger();
 }
 
-static void load_data(char *path) {
-  FILE* fd;
+static void load_data(char *path)
+{
+  FILE *fd;
   size_t len;
-  uint8_t* buf;
+  uint8_t *buf;
 
-  if((fd = fopen(path, "r")) != NULL) {
+  if ((fd = fopen(path, "r")) != NULL) {
     fseek(fd, 0, SEEK_END);
     len = ftell(fd);
     fseek(fd, 0, SEEK_SET);
 
     buf = malloc(len);
-
-    if(buf == NULL) {
+    if (buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
-
       fclose(fd);
       endwin();
       exit(1);
     }
-
-    if(fread(buf, len, 1, fd) != 1){
+    if (fread(buf, len, 1, fd) != 1){
       fprintf(stderr, "fread() failed.\n");
-
       free(buf);
       fclose(fd);
       endwin();
       exit(1);
     }
-
     Messenger_load(buf, len);
   }
   else {
     len = Messenger_size();
     buf = malloc(len);
-
-    if(buf == NULL) {
+    if (buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
       endwin();
       exit(1);
     }
-
     Messenger_save(buf);
 
     fd = fopen(path, "w");
-    if(fd == NULL) {
+    if (fd == NULL) {
       fprintf(stderr, "fopen() failed.\n");
-
       free(buf);
       endwin();
       exit(1);
     }
 
-    if(fwrite(buf, len, 1, fd) != 1){
+    if (fwrite(buf, len, 1, fd) != 1){
       fprintf(stderr, "fwrite() failed.\n");
-
       free(buf);
       fclose(fd);
       endwin();
       exit(1);
     }
   }
-
   free(buf);
   fclose(fd);
 }
 
-static void draw_bar() {
+static void draw_bar()
+{
   static int odd = 0;
-  size_t i;
 
   attron(COLOR_PAIR(4));
   mvhline(LINES - 2, 0, '_', COLS);
@@ -250,95 +260,124 @@ static void draw_bar() {
   printw(" TOXIC 1.0 |");
   attroff(COLOR_PAIR(4) | A_BOLD);
 
-  for(i=0; i<w_num; i++) {
-    if(i == w_active) {
-      attron(A_BOLD);
-    }
-
-    odd = (odd+1) % 10;
-
-    if(windows[i].blink && (odd < 5)) {
-      attron(COLOR_PAIR(3));
-    }
-
-    printw(" %s", windows[i].title);
-
-    if(windows[i].blink && (odd < 5)) {
-      attron(COLOR_PAIR(3));
-    }
-
-    if(i == w_active) {
-      attroff(A_BOLD);
+  int i;
+  for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
+    if (WINDOW_STATUS[i] != -1) {
+      if (i == active_window)
+        attron(A_BOLD);
+
+      odd = (odd+1) % 10;
+      if (windows[i].blink && (odd < 5)) {
+        attron(COLOR_PAIR(3));
+      }
+
+      printw(" %s", windows[i].title);
+      if (windows[i].blink && (odd < 5)) {
+        attron(COLOR_PAIR(3));
+      }
+      if (i == active_window) {
+        attroff(A_BOLD);
+      }
     }
   }
-
   refresh();
 }
 
-void prepare_window(WINDOW* w) {
+void prepare_window(WINDOW *w)
+{
   mvwin(w, 0, 0);
   wresize(w, LINES-2, COLS);
 }
 
-int main(int argc, char* argv[]) {
+/* Shows next window when tab or back-tab is pressed */
+void set_active_window(int ch)
+{
+  int f_inf = 0;
+  int max = MAX_WINDOW_SLOTS-1;
+  if (ch == '\t') {
+    int i = (active_window + 1) % max;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        active_window = i;
+        return;
+      }
+      i = (i  + 1) % max;
+      if (f_inf++ > max) {    // infinite loop check
+        endwin();
+        clear();
+        exit(2);
+      }
+    }
+  }else {
+    int i = active_window - 1;
+    if (i < 0) i = max;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        active_window = i;
+        return;
+      }
+      if (--i < 0) i = max;
+      if (f_inf++ > max) {
+        endwin();
+        clear();
+        exit(2);
+      }
+    }
+  }
+}
+
+int main(int argc, char *argv[])
+{
   int ch;
-  int i = 0;
   int f_flag = 0;
   char *filename = "data";
   ToxWindow* a;
 
-    for(i = 0; i < argc; i++) {
-      if (argv[i] == NULL){
-        break;
-      } else if(argv[i][0] == '-') {
-            if(argv[i][1] == 'f') {
-                if(argv[i + 1] != NULL)
-                    filename = argv[i + 1];
-                else {
-                    f_flag = -1;
-                }
-            }
-        }
+  int i = 0;
+  for (i = 0; i < argc; ++i) {
+    if (argv[i] == NULL)
+      break;
+    else if (argv[i][0] == '-') {
+      if (argv[i][1] == 'f') {
+        if (argv[i + 1] != NULL)
+          filename = argv[i + 1];
+        else
+          f_flag = -1;
+      }
     }
+  }
 
   init_term();
   init_tox();
   load_data(filename);
   init_windows();
+  init_window_status();
 
-  if(f_flag == -1) {
+  if (f_flag == -1) {
     attron(COLOR_PAIR(3) | A_BOLD);
     wprintw(prompt->window, "You passed '-f' without giving an argument!\n"
                             "defaulting to 'data' for a keyfile...\n");
     attroff(COLOR_PAIR(3) | A_BOLD);
   }
-    
-
+  
   while(true) {
-    // Update tox.
+    /* Update tox */
     do_tox();
 
-    // Draw.
-    a = &windows[w_active];
+    /* Draw */
+    a = &windows[active_window];
     prepare_window(a->window);
     a->blink = false;
     draw_bar();
     a->onDraw(a);
 
-    // Handle input.
+    /* Handle input */
     ch = getch();
-    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) {
+    if (ch == '\t' || ch == KEY_BTAB)
+      set_active_window(ch);
+    else if (ch != ERR) {
       a->onKey(a, ch);
     }
-
   }
-
   return 0;
 }
-
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 16750c5d..89c87d8f 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -1,6 +1,6 @@
 /*
- * Toxic -- Tox Curses Client
- */
+* Toxic -- Tox Curses Client
+*/
 
 #include <stdlib.h>
 #include <string.h>
@@ -16,73 +16,78 @@ 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);
+static void print_usage(ToxWindow *self);
+static char prompt_buf[256] = {0};
+static int prompt_buf_pos = 0;
 
 // XXX:
-int add_req(uint8_t* public_key) {
+int add_req(uint8_t *public_key)
+{
   memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
   ++num_requests;
-
   return num_requests-1;
 }
 
 // XXX: FIX
-unsigned char * hex_string_to_bin(char hex_string[])
+unsigned char *hex_string_to_bin(char hex_string[])
 {
-    size_t len = strlen(hex_string);
-    unsigned char *val = malloc(len);
-    char *pos = hex_string;
-    int i;
-    for(i = 0; i < len; ++i, pos+=2)
-        sscanf(pos,"%2hhx",&val[i]);
-    return val;
+  size_t len = strlen(hex_string);
+  unsigned char *val = malloc(len);
+  char *pos = hex_string;
+  int i;
+  for (i = 0; i < len; ++i, pos+=2)
+    sscanf(pos,"%2hhx",&val[i]);
+  return val;
 }
 
-static char prompt_buf[256] = {0};
-static int prompt_buf_pos=0;
-
-static void execute(ToxWindow* self, char* cmd) {
+static void execute(ToxWindow *self, char *u_cmd)
+{
+  int newlines = 0;
+  char cmd[256] = {0};
+  int i;
+  for (i = 0; i < strlen(prompt_buf); ++i) {
+    if (u_cmd[i] == '\n')
+      ++newlines;
+    else
+      cmd[i - newlines] = u_cmd[i];
+  }
 
-  if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
+  if (!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
     endwin();
     exit(0);
   }
-  else if(!strncmp(cmd, "connect ", strlen("connect "))) {
-    char* ip;
-    char* port;
-    char* key;
-    IP_Port dht;
 
-    ip = strchr(cmd, ' ');
-    if(ip == NULL) {
+  else if (!strncmp(cmd, "connect ", strlen("connect "))) {
+    IP_Port dht;
+    char *ip = strchr(cmd, ' ');
+    if (ip == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     ip++;
 
-    port = strchr(ip, ' ');
-    if(port == NULL) {
+    char *port = strchr(ip, ' ');
+    if (port == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     port[0] = 0;
     port++;
 
-    key = strchr(port, ' ');
-    if(key == NULL) {
+    char *key = strchr(port, ' ');
+    if (key == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     key[0] = 0;
     key++;
 
-    if(atoi(port) == 0) {
+    if (atoi(port) == 0) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
     dht.port = htons(atoi(port));
-
     uint32_t resolved_address = resolve_addr(ip);
     if (resolved_address == 0) {
       return;
@@ -93,49 +98,39 @@ static void execute(ToxWindow* self, char* cmd) {
     DHT_bootstrap(dht, binary_string);
     free(binary_string);
   }
-  else if(!strncmp(cmd, "add ", strlen("add "))) {
+
+  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) {
+    char *id = strchr(cmd, ' ');
+    if (id == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     id++;
-
-    msg = strchr(id, ' ');
-    if(msg != NULL) {
+    char *msg = strchr(id, ' ');
+    if (msg != NULL) {
       msg[0] = 0;
       msg++;
     }
     else msg = "";
-
-    if(strlen(id) != 2*32) {
+    if (strlen(id) != 2*32) {
       wprintw(self->window, "Invalid ID length.\n");
       return;
     }
-
-    for(i=0; i<32; i++) {
+    int i;
+    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) {
+      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);
+    int num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
     switch (num) {
     case -1:
       wprintw(self->window, "Message is too long.\n");
@@ -158,158 +153,157 @@ static void execute(ToxWindow* self, char* cmd) {
       break;
     }
   }
-  else if(!strcmp(cmd, "clear")) { 
-        wclear(self->window);
+
+  else if (!strcmp(cmd, "clear")) {
+    wclear(self->window);
   }
-  else if(!strcmp(cmd, "help")) {
-          print_usage(self);
+
+  else if (!strcmp(cmd, "help")) {
+    wclear(self->window);
+    print_usage(self);
   }
-  else if(!strncmp(cmd, "status ", strlen("status "))) {
-    char* msg;
 
-    msg = strchr(cmd, ' ');
-    if(msg == NULL) {
+  else if (!strncmp(cmd, "status ", strlen("status "))) {
+    char *msg = strchr(cmd, ' ');
+    if (msg == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     msg++;
-
     m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
     wprintw(self->window, "Status set to: %s\n", msg);
   }
-  else if(!strncmp(cmd, "nick ", strlen("nick "))) {
-    char* nick;
 
-    nick = strchr(cmd, ' ');
-    if(nick == NULL) {
+  else if (!strncmp(cmd, "nick ", strlen("nick "))) {
+    char *nick = strchr(cmd, ' ');
+    if (nick == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     nick++;
-
     setname((uint8_t*) nick, strlen(nick)+1);
     wprintw(self->window, "Nickname set to: %s\n", nick);
   }
-  else if(!strcmp(cmd, "myid")) {
+
+  else if (!strcmp(cmd, "myid")) {
     char id[32*2 + 1] = {0};
     size_t i;
-
-    for(i=0; i<32; i++) {
+    for (i = 0; i < 32; ++i) {
       char xx[3];
-      snprintf(xx, sizeof(xx), "%02x",  self_public_key[i] & 0xff);
+      snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff);
       strcat(id, xx);
     }
-    
     wprintw(self->window, "Your ID: %s\n", id);
   }
-  else if(!strncmp(cmd, "accept ", strlen("accept "))) {
-    char* id;
-    int num;
 
-    id = strchr(cmd, ' ');
-    if(id == NULL) {
+  else if (!strncmp(cmd, "accept ", strlen("accept "))) {
+    char *id = strchr(cmd, ' ');
+    if (id == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     id++;
 
-    num = atoi(id);
-    if(num >= num_requests) {
+    int num = atoi(id);
+    if (num >= num_requests) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
     num = m_addfriend_norequest(pending_requests[num]);
-
-    if(num == -1) {
+    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;
-    char* msg;
 
-    id = strchr(cmd, ' ');
-
-    if(id == NULL) {
+  else if (!strncmp(cmd, "msg ", strlen("msg "))) {
+    char *id = strchr(cmd, ' ');
+    if (id == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-    id++;
-
-    msg = strchr(id, ' ');
-    if(msg == NULL) {
+    char *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) < 0) {
+    if (m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0)
       wprintw(self->window, "Error occurred while sending message.\n");
-    }
-    else {
+    else
       wprintw(self->window, "Message successfully sent.\n");
-    }
   }
-
-  else {
+  else
     wprintw(self->window, "Invalid command.\n");
-  }
 }
 
-static void prompt_onKey(ToxWindow* self, int key) {
-  // PRINTABLE characters: Add to line.
-  if(isprint(key)) {
-    if(prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
-      return;
+static void prompt_onKey(ToxWindow *self, int key)
+{
+  /* Add printable characters to line */
+  if (isprint(key)) {
+    if (prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
+      wprintw(self->window, "\nToo Long.\n");
+      prompt_buf_pos = 0;
+      prompt_buf[0] = 0;
+    }
+    else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
+                                 && (prompt_buf_pos % (COLS - 3) == 0)) {
+      prompt_buf[prompt_buf_pos++] = '\n';
+    }
+    else if (!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS)
+                 && ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) {
+      prompt_buf[prompt_buf_pos++] = '\n';
     }
     prompt_buf[prompt_buf_pos++] = key;
     prompt_buf[prompt_buf_pos] = 0;
   }
 
-  // RETURN key: execute command.
-  else if(key == '\n') {
+  /* RETURN key: execute command */
+  else if (key == '\n') {
     wprintw(self->window, "\n");
     execute(self, prompt_buf);
     prompt_buf_pos = 0;
     prompt_buf[0] = 0;
   }
 
-  // BACKSPACE key: Remove one character from line.
-  else if(key == 0x107 || key == 0x8 || key == 0x7f) {
-    if(prompt_buf_pos != 0) {
+  /* BACKSPACE key: Remove one character from line */
+  else if (key == 0x107 || key == 0x8 || key == 0x7f) {
+    if (prompt_buf_pos != 0) {
       prompt_buf[--prompt_buf_pos] = 0;
     }
   }
 }
 
-static void prompt_onDraw(ToxWindow* self) {
+static void prompt_onDraw(ToxWindow *self)
+{
   curs_set(1);
   int x, y;
-
   getyx(self->window, y, x);
   (void) x;
+  int i;
+  for (i = 0; i < (strlen(prompt_buf)); ++i) {
+    if ((prompt_buf[i] == '\n') && (y != 0))
+      --y;
+  }
 
   wattron(self->window, COLOR_PAIR(1));
   mvwprintw(self->window, y, 0, "# ");
   wattroff(self->window, COLOR_PAIR(1));
-
   mvwprintw(self->window, y, 2, "%s", prompt_buf);
   wclrtoeol(self->window);
-
   wrefresh(self->window);
 }
 
-static void print_usage(ToxWindow* self) {
+static void print_usage(ToxWindow *self)
+{
   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");
@@ -318,8 +312,8 @@ static void print_usage(ToxWindow* self) {
   wprintw(self->window, "      myid                      : Print your ID\n");
   wprintw(self->window, "      quit/exit                 : Exit program\n");
   wprintw(self->window, "      help                      : Print this message again\n");
-  wprintw(self->window, "      clear                     : Clear this window\n");
-
+  wprintw(self->window, "      clear                     : Clear this window\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);
@@ -327,22 +321,20 @@ static void print_usage(ToxWindow* self) {
   wattroff(self->window, COLOR_PAIR(2));
 }
 
-static void prompt_onInit(ToxWindow* self) {
+static void prompt_onInit(ToxWindow *self)
+{
   scrollok(self->window, 1);
-
   print_usage(self);
   wclrtoeol(self->window);
 }
 
-ToxWindow new_prompt() {
+ToxWindow new_prompt()
+{
   ToxWindow ret;
-
   memset(&ret, 0, sizeof(ret));
-
   ret.onKey = &prompt_onKey;
   ret.onDraw = &prompt_onDraw;
   ret.onInit = &prompt_onInit;
   strcpy(ret.title, "[prompt]");
-
   return ret;
 }
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index dde1430f..cb45614d 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -3,6 +3,14 @@
  */
 
 #include <stdbool.h>
+#define TOXWINDOWS_MAX_NUM 32
+#define MAX_FRIENDS_NUM 100
+ 
+/* number of permanent default windows */
+#define N_DEFAULT_WINS 2  
+
+/* maximum window slots for WINDOW_STATUS array */
+#define MAX_WINDOW_SLOTS N_DEFAULT_WINS+MAX_FRIENDS_NUM
 
 typedef struct ToxWindow_ ToxWindow;