13 files changed, 353 insertions, 316 deletions
diff --git a/core/Messenger.c b/core/Messenger.c
index 2721f8f6..690a81b1 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -75,9 +75,9 @@ int getclient_id(Messenger *m, int friend_id, uint8_t *client_id)
    return -1;
 }
-/* 
+/*
 * returns a uint16_t that represents the checksum of address of length len
- * 
+ *
 * TODO: Another checksum algorithm might be better.
 */
 static uint16_t address_checksum(uint8_t *address, uint32_t len)
@@ -94,7 +94,7 @@ static uint16_t address_checksum(uint8_t *address, uint32_t len)
 /*
 * returns a FRIEND_ADDRESS_SIZE byte address to give to others.
 * format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
- * 
+ *
 */
 void getaddress(Messenger *m, uint8_t *address)
 {
@@ -118,7 +118,7 @@ void getaddress(Messenger *m, uint8_t *address)
 * return FAERR_ALREADYSENT if friend request already sent or already a friend
 * return FAERR_UNKNOWN for unknown error
 * return FAERR_BADCHECKSUM if bad checksum in address
- * return FAERR_SETNEWNOSPAM if the friend was already there but the nospam was different 
+ * return FAERR_SETNEWNOSPAM if the friend was already there but the nospam was different
 * (the nospam for that friend was set to the new one)
 */
 int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length)
@@ -449,8 +449,7 @@ void m_set_sends_receipts(Messenger *m, int friendnumber, int yesno)
    m->friendlist[friendnumber].receives_read_receipts = yesno;
 }
-/* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t);
+/* static void (*friend_request)(uint8_t *, uint8_t *, uint16_t); */
-static uint8_t friend_request_isset = 0; */
 /* set the function that will be executed when a friend request is received. */
 void m_callback_friendrequest(Messenger *m, void (*function)(uint8_t *, uint8_t *, uint16_t, void*), void* userdata)
 {
@@ -461,55 +460,48 @@ void m_callback_friendrequest(Messenger *m, void (*function)(uint8_t *, uint8_t
 void m_callback_friendmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata)
 {
    m->friend_message = function;
-    m->friend_message_isset = 1;
    m->friend_message_userdata = userdata;
 }
 void m_callback_action(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata)
 {
    m->friend_action = function;
-    m->friend_action_isset = 1;
    m->friend_action_userdata = userdata;
 }
 void m_callback_namechange(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata)
 {
    m->friend_namechange = function;
-    m->friend_namechange_isset = 1;
    m->friend_namechange_userdata = userdata;
 }
 void m_callback_statusmessage(Messenger *m, void (*function)(Messenger *m, int, uint8_t *, uint16_t, void*), void* userdata)
 {
    m->friend_statusmessagechange = function;
-    m->friend_statusmessagechange_isset = 1;
    m->friend_statuschange_userdata = userdata;
 }
 void m_callback_userstatus(Messenger *m, void (*function)(Messenger *m, int, USERSTATUS, void*), void* userdata)
 {
    m->friend_userstatuschange = function;
-    m->friend_userstatuschange_isset = 1;
    m->friend_userstatuschange_userdata = userdata;
 }
 void m_callback_read_receipt(Messenger *m, void (*function)(Messenger *m, int, uint32_t, void*), void* userdata)
 {
    m->read_receipt = function;
-    m->read_receipt_isset = 1;
    m->read_receipt_userdata = userdata;
 }
 void m_callback_connectionstatus(Messenger *m, void (*function)(Messenger *m, int, uint8_t, void*), void* userdata)
 {
    m->friend_connectionstatuschange = function;
-    m->friend_connectionstatuschange_isset = 1;
    m->friend_connectionstatuschange_userdata = userdata;
 }
 static void check_friend_connectionstatus(Messenger *m, int friendnumber, uint8_t status)
 {
-    if (!m->friend_connectionstatuschange_isset)
+    if (!m->friend_connectionstatuschange)
        return;
    if (status == NOFRIEND)
        return;
@@ -580,7 +572,10 @@ Messenger * initMessenger(void)
 /* run this before closing shop */
 void cleanupMessenger(Messenger *m){
-    /* FIXME TODO it seems no one frees friendlist or all the elements status */
+    /* FIXME TODO ideally cleanupMessenger will mirror initMessenger
+     * this requires the other modules to expose cleanup functions
+     */
+    free(m->friendlist);
    free(m);
 }
@@ -648,7 +643,7 @@ void doFriends(Messenger *m)
                case PACKET_ID_NICKNAME: {
                    if (data_length >= MAX_NAME_LENGTH || data_length == 0)
                        break;
-                    if(m->friend_namechange_isset)
+                    if(m->friend_namechange)
                        m->friend_namechange(m, i, data, data_length, m->friend_namechange_userdata);
                    memcpy(m->friendlist[i].name, data, data_length);
                    m->friendlist[i].name[data_length - 1] = 0; /* make sure the NULL terminator is present. */
@@ -659,7 +654,7 @@ void doFriends(Messenger *m)
                        break;
                    uint8_t *status = calloc(MIN(data_length, MAX_STATUSMESSAGE_LENGTH), 1);
                    memcpy(status, data, MIN(data_length, MAX_STATUSMESSAGE_LENGTH));
-                    if (m->friend_statusmessagechange_isset)
+                    if (m->friend_statusmessagechange)
                        m->friend_statusmessagechange(m, i, status, MIN(data_length, MAX_STATUSMESSAGE_LENGTH),
                                                      m->friend_statuschange_userdata);
                    set_friend_statusmessage(m, i, status, MIN(data_length, MAX_STATUSMESSAGE_LENGTH));
@@ -670,7 +665,7 @@ void doFriends(Messenger *m)
                    if (data_length != 1)
                        break;
                    USERSTATUS status = data[0];
-                    if (m->friend_userstatuschange_isset)
+                    if (m->friend_userstatuschange)
                        m->friend_userstatuschange(m, i, status, m->friend_userstatuschange_userdata);
                    set_friend_userstatus(m, i, status);
                    break;
@@ -683,12 +678,12 @@ void doFriends(Messenger *m)
                    if (m->friendlist[i].receives_read_receipts) {
                        write_cryptpacket_id(m, i, PACKET_ID_RECEIPT, message_id, message_id_length);
                    }
-                    if (m->friend_message_isset)
+                    if (m->friend_message)
                        (*m->friend_message)(m, i, message, message_length, m->friend_message_userdata);
                    break;
                }
                case PACKET_ID_ACTION: {
-                    if (m->friend_action_isset)
+                    if (m->friend_action)
                        (*m->friend_action)(m, i, data, data_length, m->friend_action_userdata);
                    break;
                }
@@ -698,7 +693,7 @@ void doFriends(Messenger *m)
                        break;
                    memcpy(&msgid, data, sizeof(msgid));
                    msgid = ntohl(msgid);
-                    if (m->read_receipt_isset)
+                    if (m->read_receipt)
                        (*m->read_receipt)(m, i, msgid, m->read_receipt_userdata);
                    break;
                }
@@ -744,14 +739,14 @@ void doMessenger(Messenger *m)
    doNetCrypto();
    doInbound(m);
    doFriends(m);
-    
    timer_poll();
 }
 /* returns the size of the messenger data (for saving) */
 uint32_t Messenger_size(Messenger *m)
 {
-    return crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES
+    return crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES + sizeof(uint32_t)
           + sizeof(uint32_t) + DHT_size() + sizeof(uint32_t) + sizeof(Friend) * m->numfriends;
 }
diff --git a/core/Messenger.h b/core/Messenger.h
index 9621176f..a2add19d 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -111,28 +111,20 @@ typedef struct Messenger {
    uint32_t numfriends;
    void (*friend_message)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    uint8_t friend_message_isset;
    void* friend_message_userdata;
    void (*friend_action)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    uint8_t friend_action_isset;
    void* friend_action_userdata;
    void (*friend_namechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    uint8_t friend_namechange_isset;
    void* friend_namechange_userdata;
    void (*friend_statusmessagechange)(struct Messenger *m, int, uint8_t *, uint16_t, void*);
-    uint8_t friend_statusmessagechange_isset;
    void* friend_statusmessagechange_userdata;
    void (*friend_userstatuschange)(struct Messenger *m, int, USERSTATUS, void*);
-    uint8_t friend_userstatuschange_isset;
    void* friend_userstatuschange_userdata;
    void (*read_receipt)(struct Messenger *m, int, uint32_t, void*);
-    uint8_t read_receipt_isset;
    void* read_receipt_userdata;
    void (*friend_statuschange)(struct Messenger *m, int, uint8_t, void*);
-    uint8_t friend_statuschange_isset;
    void* friend_statuschange_userdata;
    void (*friend_connectionstatuschange)(struct Messenger *m, int, uint8_t, void*);
-    uint8_t friend_connectionstatuschange_isset;
    void* friend_connectionstatuschange_userdata;
@@ -141,7 +133,7 @@ typedef struct Messenger {
 /*
 * returns a FRIEND_ADDRESS_SIZE byte address to give to others.
 * format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
- * 
+ *
 */
 void getaddress(Messenger *m, uint8_t *address);
@@ -157,7 +149,7 @@ void getaddress(Messenger *m, uint8_t *address);
 * return -4 if friend request already sent or already a friend
 * return -5 for unknown error
 * return -6 if bad checksum in address
- * return -7 if the friend was already there but the nospam was different 
+ * return -7 if the friend was already there but the nospam was different
 * (the nospam for that friend was set to the new one)
 */
 int m_addfriend(Messenger *m, uint8_t *address, uint8_t *data, uint16_t length);
diff --git a/testing/nTox.c b/testing/nTox.c
index cab2d158..ead4fd21 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -52,28 +52,15 @@ uint8_t num_requests = 0;
 void get_id(Messenger *m, char *data)
 {
-    char idstring0[200];
+    sprintf(data, "[i] ID: ");
-    char idstring1[FRIEND_ADDRESS_SIZE][5];
+    int offset = strlen(data);
-    char idstring2[FRIEND_ADDRESS_SIZE][5];
    int i = 0;
    uint8_t address[FRIEND_ADDRESS_SIZE];
    getaddress(m, address);
-    for(i = 0; i < FRIEND_ADDRESS_SIZE; i++)
+    for(; i < FRIEND_ADDRESS_SIZE; i++)
    {
-        if (address[i] < (FRIEND_ADDRESS_SIZE / 2))
+        sprintf(data + 2*i + offset, "%02X ", address[i]);
-            strcpy(idstring1[i],"0");
-        else
-            strcpy(idstring1[i], "");
-        sprintf(idstring2[i], "%hhX",address[i]);
    }
-    strcpy(idstring0,"[i] ID: ");
-    int j = 0;
-    for (j = 0; j < FRIEND_ADDRESS_SIZE; j++) {
-        strcat(idstring0,idstring1[j]);
-        strcat(idstring0,idstring2[j]);
-    }
-    memcpy(data, idstring0, strlen(idstring0));
 }
 void new_lines(char *line)
diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
index 13b8692d..dd811b97 100644
--- a/testing/toxic/CMakeLists.txt
+++ b/testing/toxic/CMakeLists.txt
@@ -8,6 +8,7 @@ set(exe_name toxic)
 add_executable(${exe_name}
        main.c
+        windows.c
        prompt.c
        friendlist.c
        chat.c
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index 1b5e743d..e4da9484 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -13,6 +13,8 @@
 #include "../../core/network.h"
 #include "windows.h"
+#include "friendlist.h"
+#include "chat.h"
 #define CURS_Y_OFFSET 3
@@ -24,10 +26,6 @@ typedef struct {
  WINDOW* linewin;
 } ChatContext;
-extern int active_window;
-extern void del_window(ToxWindow *w, int f_num);
-extern void fix_name(uint8_t *name);
 void print_help(ChatContext *self);
 void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd);
@@ -320,7 +318,6 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
  }
  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);
diff --git a/testing/toxic/chat.h b/testing/toxic/chat.h
new file mode 100644
index 00000000..7599d462
--- /dev/null
+++ b/testing/toxic/chat.h
@@ -0,0 +1,6 @@
+#ifndef CHAT_H_6489PZ13
+#define CHAT_H_6489PZ13
+ToxWindow new_chat(Messenger *m, int friendnum);
+#endif /* end of include guard: CHAT_H_6489PZ13 */
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index 56061cf9..e7504fbf 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -11,12 +11,9 @@
 #include "../../core/network.h"
 #include "windows.h"
+#include "friendlist.h"
-extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM];
+static char * WINDOW_STATUS;
-extern int add_window(ToxWindow w, int n);
-extern ToxWindow new_chat(Messenger *m, int friendnum);
-extern int active_window;
 typedef struct {
  uint8_t name[MAX_NAME_LENGTH];
@@ -54,8 +51,7 @@ void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str,
    for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
      if (WINDOW_STATUS[i] == -1) {
        WINDOW_STATUS[i] = num;
-        add_window(new_chat(m, num), i);
+        add_window(m, new_chat(m, num), i);
-        active_window = i;
        break;
      }
    }
@@ -111,7 +107,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
      int i;
      for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
        if (WINDOW_STATUS[i] == num_selected) {
-          active_window = i;
+          set_active_window(i);
          break;
        }
      }
@@ -121,8 +117,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
        if (WINDOW_STATUS[i] == -1) {
          WINDOW_STATUS[i] = num_selected;
          friends[num_selected].chatwin = num_selected;
-          add_window(new_chat(m, num_selected), i);
+          add_window(m, new_chat(m, num_selected), i);
-          active_window = i;
          break;
        }
      }
@@ -169,7 +164,8 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
 }
-ToxWindow new_friendlist() {
+ToxWindow new_friendlist(char * ws) {
+  WINDOW_STATUS = ws;
  ToxWindow ret;
  memset(&ret, 0, sizeof(ret));
diff --git a/testing/toxic/friendlist.h b/testing/toxic/friendlist.h
new file mode 100644
index 00000000..c3d8dac7
--- /dev/null
+++ b/testing/toxic/friendlist.h
@@ -0,0 +1,12 @@
+#ifndef FRIENDLIST_H_53I41IM
+#define FRIENDLIST_H_53I41IM
+#include "windows.h"
+#include "chat.h"
+ToxWindow new_friendlist(char * ws);
+int friendlist_onFriendAdded(Messenger *m, int num);
+void disable_chatwin(int f_num);
+void fix_name(uint8_t *name);
+#endif /* end of include guard: FRIENDLIST_H_53I41IM */
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 40ff5d09..063c1483 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -21,93 +21,9 @@
 #include "configdir.h"
 #include "windows.h"
+#include "prompt.h"
+#include "friendlist.h"
-extern ToxWindow new_prompt();
-extern ToxWindow new_friendlist();
-extern int friendlist_onFriendAdded(Messenger *m, int num);
-extern void disable_chatwin(int f_num);
-extern int add_req(uint8_t *public_key); // XXX
-extern unsigned char *hex_string_to_bin(char hex_string[]);
-/* Holds status of chat windows */
-char WINDOW_STATUS[MAX_WINDOW_SLOTS];
-#ifndef TOXICVER
-#define TOXICVER "NOVER" //Use the -D flag to set this
-#endif
-static ToxWindow windows[MAX_WINDOW_SLOTS];
-static ToxWindow* prompt;
-static Messenger *m;
-int w_num;
-int active_window;
-/* CALLBACKS START */
-void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
-{
-  int n = add_req(public_key);
-  wprintw(prompt->window, "\nFriend request from:\n");
-  int i;
-  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
-    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
-  }
-  wprintw(prompt->window, "\nWith the message: %s\n", data);
-  wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
-  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onMessage != NULL)
-      windows[i].onMessage(&windows[i], m, friendnumber, string, length);
-  }
-}
-void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onAction != NULL)
-      windows[i].onAction(&windows[i], m, friendnumber, string, length);
-  }
-}
-void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
-  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
-  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)
-{
-  friendlist_onFriendAdded(m, friendnumber);
-}
-/* CALLBACKS END */
 static void init_term()
 {
@@ -129,10 +45,10 @@ static void init_term()
  refresh();
 }
-static void init_tox()
+static Messenger * init_tox()
 {
  /* Init core */
-  m = initMessenger();
+  Messenger *m = initMessenger();
  /* Callbacks */
  m_callback_friendrequest(m, on_request, NULL);
@@ -147,6 +63,7 @@ static void init_tox()
 #else
  setname(m, (uint8_t*) "Hipster", sizeof("Hipster"));
 #endif
+  return m;
 }
 #define MAXLINE 90    /* Approx max number of chars in a sever line (IP + port + key) */
@@ -195,67 +112,7 @@ int init_connection(void)
  return 0;
 }
-void init_window_status()
+static void do_tox(Messenger *m, ToxWindow * prompt)
-{
-  /* 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[n] = w;
-  w.onInit(&w, m);
-  w_num++;
-  return n;
-}
-/* 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;
-  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[n_prompt];
-}
-static void do_tox()
 {
  static int conn_try = 0;
  static int conn_err = 0;
@@ -279,7 +136,7 @@ static void do_tox()
  doMessenger(m);
 }
-static void load_data(char *path)
+static void load_data(Messenger *m, char *path)
 {
  FILE *fd;
  size_t len;
@@ -336,88 +193,8 @@ static void load_data(char *path)
  fclose(fd);
 }
-static void draw_bar()
-{
-  static int odd = 0;
-  int blinkrate = 30;
-  attron(COLOR_PAIR(4));
-  mvhline(LINES - 2, 0, '_', COLS);
-  attroff(COLOR_PAIR(4));
-  move(LINES - 1, 0);
-  attron(COLOR_PAIR(4) | A_BOLD);
-  printw(" TOXIC " TOXICVER "|");
-  attroff(COLOR_PAIR(4) | 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) % blinkrate;
-      if (windows[i].blink && (odd < (blinkrate/2)))
-        attron(COLOR_PAIR(3));
-      printw(" %s", windows[i].title);
-      if (windows[i].blink && (odd < (blinkrate/2)))
-        attroff(COLOR_PAIR(3));
-      if (i == active_window) {
-        attroff(A_BOLD);
-      }
-    }
-  }
-  refresh();
-}
-void prepare_window(WINDOW *w)
-{
-  mvwin(w, 0, 0);
-  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 = (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();
-        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();
-        exit(2);
-      }
-    }
-  }
-}
 int main(int argc, char *argv[])
 {
-  int ch;
-  ToxWindow* a;
  char *user_config_dir = get_user_config_dir();
  char *DATA_FILE;
  int config_err = create_user_config_dir(user_config_dir);
@@ -451,12 +228,12 @@ int main(int argc, char *argv[])
  }
  init_term();
-  init_tox();
+  Messenger *m = init_tox();
-  init_windows();
+  ToxWindow * prompt = init_windows(m);
  init_window_status();
  if(f_loadfromfile)
-    load_data(DATA_FILE);
+    load_data(m, DATA_FILE);
  free(DATA_FILE);
  if (f_flag == -1) {
@@ -474,21 +251,10 @@ int main(int argc, char *argv[])
  }
  while(true) {
    /* Update tox */
-    do_tox();
+    do_tox(m, prompt);
    /* Draw */
-    a = &windows[active_window];
+    draw_active_window(m);
-    prepare_window(a->window);
-    a->blink = false;
-    draw_bar();
-    a->onDraw(a);
-    /* Handle input */
-    ch = getch();
-    if (ch == '\t' || ch == KEY_BTAB)
-      set_active_window(ch);
-    else if (ch != ERR)
-      a->onKey(a, m, ch);
  }
  cleanupMessenger(m);
  return 0;
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index e1a7d75c..fb8a5090 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -11,11 +11,12 @@
 #include "../../core/network.h"
 #include "windows.h"
+#include "prompt.h"
 uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
-extern void on_friendadded(int friendnumber);
+static friendAddedFn *on_friendadded;
 static char prompt_buf[MAX_STR_SIZE] = {0};
 static int prompt_buf_pos = 0;
@@ -87,7 +88,7 @@ void cmd_accept(ToxWindow *self, Messenger *m, char **args)
    wprintw(self->window, "Failed to add friend.\n");
  else {
    wprintw(self->window, "Friend accepted as: %d.\n", num);
-    on_friendadded(num);
+    on_friendadded(m, num);
  }
 }
@@ -121,6 +122,11 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
    }
    id_bin[i] = x;
  }
+  
+  for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
+    id[i] = toupper(id[i]);
+  }
+  
  int num = m_addfriend(m, id_bin, (uint8_t*) msg, strlen(msg)+1);
  switch (num) {
  case FAERR_TOOLONG:
@@ -138,9 +144,15 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
  case FAERR_UNKNOWN:
    wprintw(self->window, "Undefined error when adding friend.\n");
    break;
+  case FAERR_BADCHECKSUM:
+    wprintw(self->window, "Bad checksum in address.\n");
+    break;
+  case FAERR_SETNEWNOSPAM:
+    wprintw(self->window, "Nospam was different.\n");
+    break;
  default:
    wprintw(self->window, "Friend added as %d.\n", num);
-    on_friendadded(num);
+    on_friendadded(m, num);
    break;
  }
 }
@@ -422,8 +434,9 @@ static void prompt_onInit(ToxWindow *self, Messenger *m)
  wclrtoeol(self->window);
 }
-ToxWindow new_prompt()
+ToxWindow new_prompt(friendAddedFn *f)
 {
+  on_friendadded = f; 
  ToxWindow ret;
  memset(&ret, 0, sizeof(ret));
  ret.onKey = &prompt_onKey;
diff --git a/testing/toxic/prompt.h b/testing/toxic/prompt.h
new file mode 100644
index 00000000..6c5320ab
--- /dev/null
+++ b/testing/toxic/prompt.h
@@ -0,0 +1,14 @@
+#ifndef PROMPT_H_UZYGWFFL
+#define PROMPT_H_UZYGWFFL
+#include "windows.h"
+typedef void (friendAddedFn)(Messenger *m, int friendnumber);
+ToxWindow new_prompt(friendAddedFn *f);
+int add_req(uint8_t *public_key);
+unsigned char *hex_string_to_bin(char hex_string[]);
+#endif /* end of include guard: PROMPT_H_UZYGWFFL */
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
new file mode 100644
index 00000000..d19392ac
--- /dev/null
+++ b/testing/toxic/windows.c
@@ -0,0 +1,235 @@
+#include "friendlist.h"
+#include "prompt.h"
+#include "windows.h"
+/* Holds status of chat windows */
+char WINDOW_STATUS[MAX_WINDOW_SLOTS];
+static int w_num;
+static ToxWindow windows[MAX_WINDOW_SLOTS];
+static Messenger *m;
+int active_window;
+static ToxWindow* prompt;
+/* CALLBACKS START */
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
+{
+  int n = add_req(public_key);
+  wprintw(prompt->window, "\nFriend request from:\n");
+  int i;
+  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
+    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
+  }
+  wprintw(prompt->window, "\nWith the message: %s\n", data);
+  wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
+  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onMessage != NULL)
+      windows[i].onMessage(&windows[i], m, friendnumber, string, length);
+  }
+}
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onAction != NULL)
+      windows[i].onAction(&windows[i], m, friendnumber, string, length);
+  }
+}
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
+  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
+  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(Messenger *m, int friendnumber)
+{
+  friendlist_onFriendAdded(m, friendnumber);
+}
+/* CALLBACKS END */
+int add_window(Messenger *m, 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[n] = w;
+  w.onInit(&w, m);
+  w_num++;
+  active_window = n;
+  return n;
+}
+/* Deletes window w and cleans up */
+void del_window(ToxWindow *w, int f_num)
+{
+  active_window = 0; // Go to prompt screen
+  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();
+}
+/* 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();
+        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();
+        exit(2);
+      }
+    }
+  }
+}
+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;
+}
+ToxWindow * init_windows()
+{
+  w_num = 0;
+  int n_prompt = 0;
+  int n_friendslist = 1;
+  if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
+                        || add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1) {
+    fprintf(stderr, "add_window() failed.\n");
+    endwin();
+    exit(1);
+  }
+  prompt = &windows[n_prompt];
+  return prompt;
+}
+static void draw_bar()
+{
+  static int odd = 0;
+  int blinkrate = 30;
+  attron(COLOR_PAIR(4));
+  mvhline(LINES - 2, 0, '_', COLS);
+  attroff(COLOR_PAIR(4));
+  move(LINES - 1, 0);
+  attron(COLOR_PAIR(4) | A_BOLD);
+  printw(" TOXIC " TOXICVER "|");
+  attroff(COLOR_PAIR(4) | 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) % blinkrate;
+      if (windows[i].blink && (odd < (blinkrate/2)))
+        attron(COLOR_PAIR(3));
+      printw(" %s", windows[i].title);
+      if (windows[i].blink && (odd < (blinkrate/2)))
+        attroff(COLOR_PAIR(3));
+      if (i == active_window) {
+        attroff(A_BOLD);
+      }
+    }
+  }
+  refresh();
+}
+void prepare_window(WINDOW *w)
+{
+  mvwin(w, 0, 0);
+  wresize(w, LINES-2, COLS);
+}
+void draw_active_window(Messenger * m)
+{
+  ToxWindow *a = &windows[active_window];
+  prepare_window(a->window);
+  a->blink = false;
+  draw_bar();
+  a->onDraw(a);
+  /* Handle input */
+  int ch = getch();
+  if (ch == '\t' || ch == KEY_BTAB)
+    set_active_window(ch);
+  else if (ch != ERR)
+    a->onKey(a, m, ch);
+}
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index 648243d0..7d81e814 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -1,8 +1,13 @@
 /*
 * Toxic -- Tox Curses Client
 */
+#ifndef _windows_h
+#define _windows_h
+#include <curses.h>
+#include <stdint.h>
 #include <stdbool.h>
+#include "../../core/Messenger.h"
 #define TOXWINDOWS_MAX_NUM 32
 #define MAX_FRIENDS_NUM 100
 #define MAX_STR_SIZE 256
@@ -14,6 +19,10 @@
 /* maximum window slots for WINDOW_STATUS array */
 #define MAX_WINDOW_SLOTS N_DEFAULT_WINS+MAX_FRIENDS_NUM
+#ifndef TOXICVER
+#define TOXICVER "NOVER" //Use the -D flag to set this
+#endif
 typedef struct ToxWindow_ ToxWindow;
 struct ToxWindow_ {
@@ -32,3 +41,17 @@ struct ToxWindow_ {
  WINDOW* window;
 };
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata);
+void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void init_window_status();
+ToxWindow * init_windows();
+void draw_active_window(Messenger * m);
+int add_window(Messenger *m, ToxWindow w, int n);
+void del_window(ToxWindow *w, int f_num);
+void set_active_window(int ch);
+#endif