7 files changed, 249 insertions, 139 deletions

diff --git a/testing/nTox.c b/testing/nTox.c
index fe91b1fa..63d0c32e 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -228,7 +228,7 @@ void line_eval(char *line)
                 status[i-3] = line[i];
             }
             status[i-3] = 0;
-            m_set_userstatus(status, strlen((char*)status) + 1);
+            m_set_userstatus(USERSTATUS_KIND_ONLINE, status, strlen((char*)status) + 1);
             char numstring[100];
             sprintf(numstring, "[i] changed status to %s", (char*)status);
             new_lines(numstring);
@@ -364,7 +364,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
     }
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
+void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     if(getname(friendnumber, (uint8_t*)name) != -1) {
@@ -392,7 +392,7 @@ void load_key(char *path)
         }
         Messenger_load(data, size);
 
-    } else { 
+    } else {
         //else save new keys
         int size = Messenger_size();
         uint8_t data[size];
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index f3c7a188..dbbd0f6e 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
 #include "nTox_win32.h"
@@ -86,7 +86,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
     printf(msg);
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) 
+void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -95,7 +95,7 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
     printf(msg);
 }
 
-void load_key() 
+void load_key()
 {
     FILE *data_file = NULL;
     data_file = fopen("data","r");
@@ -130,7 +130,7 @@ void add_friend()
     int i;
     char temp_id[128];
     
-    for (i = 0; i < 128; i++)  
+    for (i = 0; i < 128; i++)
         temp_id[i] = line[i+3];
     
     int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
@@ -141,7 +141,7 @@ void add_friend()
         printf(numstring);
         ++maxnumfriends;
     }
-    else if (num == -1) 
+    else if (num == -1)
         printf("\n[i] Message is too long.\n\n");
     
     else if (num == -2)
@@ -180,7 +180,7 @@ void list_friends()
         char name[MAX_NAME_LENGTH];
         getname(i, (uint8_t*)name);
         
-        if (m_friendstatus(i) == 4)    
+        if (m_friendstatus(i) == 4)
             printf("[%d] %s\n", i, (uint8_t*)name);
     }
 
@@ -213,7 +213,7 @@ void message_friend()
     
     for (i = 0; i < len; i++) {
 
-        if (line[i+3] != ' ') 
+        if (line[i+3] != ' ')
             numstring[i] = line[i+3];
 
         else {
@@ -243,7 +243,7 @@ void change_nickname()
     
     for (i = 3; i < len; i++) {
 
-        if (line[i] == 0 || line[i] == '\n') 
+        if (line[i] == 0 || line[i] == '\n')
             break;
 
         name[i-3] = line[i];
@@ -268,7 +268,7 @@ void change_status(int savetofile)
     size_t len = strlen(line);
     
     for (i = 3; i < len; i++) {
-        if (line[i] == 0 || line[i] == '\n') 
+        if (line[i] == 0 || line[i] == '\n')
             break;
         
         status[i-3] = line[i];
@@ -350,7 +350,7 @@ void line_eval(char* line)
                 accept_friend_request(line);
         }
         /* EXIT */
-        else if (inpt_command == 'q') { 
+        else if (inpt_command == 'q') {
             strcpy(line, "---Offline");
             change_status(0);
             exit(EXIT_SUCCESS);
@@ -398,7 +398,7 @@ int main(int argc, char *argv[])
         nameloaded = 1;
         printf("%s\n", name);
         fclose(name_file);
-    } 
+    }
 
     FILE* status_file = NULL;
     status_file = fopen("statusfile.txt", "r");
@@ -424,7 +424,7 @@ int main(int argc, char *argv[])
     {
         if(self_public_key[i] < (PUB_KEY_BYTES/2))
             strcpy(idstring1[i],"0");
-        else 
+        else
             strcpy(idstring1[i], "");
         sprintf(idstring2[i], "%hhX",self_public_key[i]);
     }
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
     int resolved_address = resolve_addr(argv[1]);
     if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
-    else 
+    else
         exit(1);
     
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index ff7a1667..7262e722 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -25,6 +25,8 @@ typedef struct {
 
 } ChatContext;
 
+extern int w_active;
+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);
@@ -32,7 +34,7 @@ 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;
@@ -50,7 +52,7 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
   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);
@@ -58,6 +60,8 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len)
   wprintw(ctx->history, "%s\n", msg);
 
   self->blink = true;
+  beep();
+  flash();
 }
 
 static void chat_onNickChange(ToxWindow* self, int num, uint8_t* nick, uint16_t len) {
@@ -116,7 +120,7 @@ static void chat_onKey(ToxWindow* self, int key) {
       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);
@@ -161,7 +165,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
       return;
     }
     msg++;
-    m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
+    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 "))) {
@@ -185,6 +189,12 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
     }
     wprintw(ctx->history, "Your ID: %s\n", id);
   }
+  else if (strcmp(ctx->line, "/close") == 0) {
+    w_active = 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");
 }
@@ -217,17 +227,19 @@ static void chat_onInit(ToxWindow* self) {
   scrollok(ctx->history, 1);
 
   ctx->linewin = subwin(self->window, 2, x, y - 3, 0);
+  print_help(ctx);
 }
 
 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");
 
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index b4b619a2..94e8fb47 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -12,11 +12,10 @@
 
 #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 w_active;
 
 typedef struct {
   uint8_t name[MAX_NAME_LENGTH];
@@ -53,7 +52,17 @@ void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len)
     return;
 
   if(friends[num].chatwin == -1) {
-    friends[num].chatwin = add_window(new_chat(num));
+    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);
+        w_active = i;
+        break;
+      }
+    }
   }
 }
 
@@ -86,29 +95,42 @@ int friendlist_onFriendAdded(int 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--;
+    num_selected--;
+    if (num_selected < 0)
+      num_selected = num_friends-1;
   }
   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);
+    /* 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) {
+          w_active = 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);
+          w_active = i;
+          break;
+        }
+      }
+    }
   }
 }
 
@@ -116,7 +138,7 @@ static void friendlist_onDraw(ToxWindow* self) {
   curs_set(0);
   size_t i;
 
-  wclear(self->window);
+  werase(self->window);
 
   if(num_friends == 0) {
     wprintw(self->window, "Empty. Add some friends! :-)\n");
@@ -145,6 +167,10 @@ static void friendlist_onDraw(ToxWindow* self) {
   wrefresh(self->window);
 }
 
+void disable_chatwin(int f_num) {
+  friends[f_num].chatwin = -1;
+}
+
 static void friendlist_onInit(ToxWindow* self) {
 
 }
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 45760b1c..19a0b959 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -17,14 +17,13 @@ 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
 
-#define TOXWINDOWS_MAX_NUM 32
-
-static ToxWindow windows[TOXWINDOWS_MAX_NUM];
-static int w_num;
-static int w_active;
+char WINDOW_STATUS[MAX_WINDOW_SLOTS];    // Holds status of chat windows
+static ToxWindow windows[MAX_WINDOW_SLOTS];
+int w_num;
+int w_active;
 static ToxWindow* prompt;
 
 // CALLBACKS START
@@ -41,7 +40,7 @@ void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) {
 
   wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n);
 
-  for(i=0; i<w_num; i++) {
+  for(i=0; i<MAX_WINDOW_SLOTS; i++) {
     if(windows[i].onFriendRequest != NULL)
       windows[i].onFriendRequest(&windows[i], public_key, data, length);
   }
@@ -52,7 +51,7 @@ 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++) {
+  for(i=0; i<MAX_WINDOW_SLOTS; i++) {
     if(windows[i].onMessage != NULL)
       windows[i].onMessage(&windows[i], friendnumber, string, length);
   }
@@ -63,18 +62,18 @@ 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++) {
+  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, uint8_t* string, uint16_t length) {
+void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) {
   size_t i;
 
-  wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string);
+  wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
 
-  for(i=0; i<w_num; i++) {
+  for(i=0; i<MAX_WINDOW_SLOTS; i++) {
     if(windows[i].onStatusChange != NULL)
       windows[i].onStatusChange(&windows[i], friendnumber, string, length);
   }
@@ -115,44 +114,60 @@ static void init_tox() {
   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)
     return -1;
 
   w.window = newwin(LINES - 2, COLS, 0, 0);
-
   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() {
   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() {
@@ -201,7 +216,7 @@ static void load_data(char *path) {
 
     Messenger_load(buf, len);
   }
-  else { 
+  else {
     len = Messenger_size();
     buf = malloc(len);
 
@@ -238,7 +253,6 @@ static void load_data(char *path) {
 
 static void draw_bar() {
   static int odd = 0;
-  size_t i;
 
   attron(COLOR_PAIR(4));
   mvhline(LINES - 2, 0, '_', COLS);
@@ -250,28 +264,26 @@ 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-1); i++) {
+    if (WINDOW_STATUS[i] != -1) {
+      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);
+      }
     }
   }
-
   refresh();
 }
 
@@ -280,6 +292,42 @@ void prepare_window(WINDOW* w) {
   wresize(w, LINES-2, COLS);
 }
 
+/* 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 = (w_active + 1) % max;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        w_active = i;
+        return;
+      }
+      i = (i  + 1) % max;
+      if (f_inf++ > max) {   // infinite loop check
+        endwin();
+        clear();
+        exit(2);
+      }
+    }
+  }else {
+    int i = w_active - 1;
+    if (i < 0) i = max;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        w_active = 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;
@@ -289,7 +337,7 @@ int main(int argc, char* argv[]) {
 
     for(i = 0; i < argc; i++) {
       if (argv[i] == NULL){
-        break; 
+        break;
       } else if(argv[i][0] == '-') {
             if(argv[i][1] == 'f') {
                 if(argv[i + 1] != NULL)
@@ -305,6 +353,7 @@ int main(int argc, char* argv[]) {
   init_tox();
   load_data(filename);
   init_windows();
+  init_window_status();
 
   if(f_flag == -1) {
     attron(COLOR_PAIR(3) | A_BOLD);
@@ -312,8 +361,7 @@ int main(int argc, char* argv[]) {
                             "defaulting to 'data' for a keyfile...\n");
     attroff(COLOR_PAIR(3) | A_BOLD);
   }
-    
-
+  
   while(true) {
     // Update tox.
     do_tox();
@@ -327,18 +375,14 @@ int main(int argc, char* argv[]) {
 
     // 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;
+    if(ch == '\t' || ch == KEY_BTAB)
+      set_active_window(ch);
+    else if(ch != ERR) {
+      a->onKey(a, ch);
     }
     else if(ch != ERR) {
       a->onKey(a, ch);
     }
-
   }
-
   return 0;
 }
-
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index e5dc5086..20f6b480 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>
@@ -41,7 +41,17 @@ unsigned char * hex_string_to_bin(char hex_string[])
 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 i;
+        int newlines = 0;
+        char cmd[256] = {0};
+    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")) {
     endwin();
@@ -91,7 +101,7 @@ static void execute(ToxWindow* self, char* cmd) {
     dht.ip.i = resolved_address;
     unsigned char *binary_string = hex_string_to_bin(key);
     DHT_bootstrap(dht, binary_string);
-    free(binary_string); 
+    free(binary_string);
   }
   else if(!strncmp(cmd, "add ", strlen("add "))) {
     uint8_t id_bin[32];
@@ -137,7 +147,7 @@ static void execute(ToxWindow* self, char* cmd) {
 
     num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
     switch (num) {
-    case -1: 
+    case -1:
       wprintw(self->window, "Message is too long.\n");
       break;
     case -2:
@@ -151,18 +161,19 @@ static void execute(ToxWindow* self, char* cmd) {
       break;
     case -5:
       wprintw(self->window, "Undefined error when adding friend.\n");
-      break; 
+      break;
     default:
       wprintw(self->window, "Friend added as %d.\n", num);
       on_friendadded(num);
       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);
+      wclear(self->window);
+      print_usage(self);
   }
   else if(!strncmp(cmd, "status ", strlen("status "))) {
     char* msg;
@@ -174,7 +185,7 @@ static void execute(ToxWindow* self, char* cmd) {
     }
     msg++;
 
-    m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
+    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 "))) {
@@ -196,7 +207,7 @@ static void execute(ToxWindow* self, char* cmd) {
 
     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);
     }
     
@@ -256,7 +267,6 @@ static void execute(ToxWindow* self, char* cmd) {
       wprintw(self->window, "Message successfully sent.\n");
     }
   }
-
   else {
     wprintw(self->window, "Invalid command.\n");
   }
@@ -265,8 +275,16 @@ static void execute(ToxWindow* self, char* cmd) {
 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;
+        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;
@@ -289,20 +307,22 @@ static void prompt_onKey(ToxWindow* self, int key) {
 }
 
 static void prompt_onDraw(ToxWindow* self) {
-  curs_set(1);
-  int x, y;
-
-  getyx(self->window, y, x);
-  (void) x;
-
-  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);
+    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) {
@@ -310,15 +330,15 @@ static void print_usage(ToxWindow* self) {
   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");
-  wprintw(self->window, "      help                      : Print this message again\n");
-  wprintw(self->window, "      clear                     : Clear this window\n");
+    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");
+    wprintw(self->window, "      help                      : Print this message again\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");
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;