10 files changed, 111 insertions, 169 deletions

diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index ef932cd2..57404a59 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -123,8 +123,7 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1
 
     status[len - 1] = '\0';
     fix_name(status);
-    snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num);
-
+    
     wattron(ctx->history, COLOR_PAIR(3));
     wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
     wattroff(ctx->history, COLOR_PAIR(3));
@@ -335,7 +334,8 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
     else if (strcmp(ctx->line, "/close") == 0) {
         int f_num = ctx->friendnum;
         delwin(ctx->linewin);
-        del_window(self, f_num);
+        del_window(self);
+        disable_chatwin(f_num);
     }
 
     else
diff --git a/testing/toxic/configdir.c b/testing/toxic/configdir.c
index 1a62e8ed..a43dd1de 100644
--- a/testing/toxic/configdir.c
+++ b/testing/toxic/configdir.c
@@ -98,14 +98,18 @@ char *get_user_config_dir(void)
 
     snprintf(user_config_dir, len, "%s/Library/Application Support", home);
 # else /* __APPLE__ */
-    len = strlen(home) + strlen("/.config") + 1;
-    user_config_dir = malloc(len);
 
-    if (user_config_dir == NULL) {
-        return NULL;
+    if (!(user_config_dir = getenv("XDG_CONFIG_HOME"))) {
+        len = strlen(home) + strlen("/.config") + 1;
+        user_config_dir = malloc(len);
+
+        if (user_config_dir == NULL) {
+            return NULL;
+        }
+
+        snprintf(user_config_dir, len, "%s/.config", home);
     }
 
-    snprintf(user_config_dir, len, "%s/.config", home);
 # endif /* __APPLE__ */
 
     return user_config_dir;
diff --git a/testing/toxic/configdir.h b/testing/toxic/configdir.h
index 17d95107..e886e53a 100644
--- a/testing/toxic/configdir.h
+++ b/testing/toxic/configdir.h
@@ -19,9 +19,9 @@
  */
 
 #ifdef _win32
-#define CONFIGDIR "\\toxic\\"
+#define CONFIGDIR "\\tox\\"
 #else
-#define CONFIGDIR "/toxic/"
+#define CONFIGDIR "/tox/"
 #endif
 
 #ifndef S_ISDIR
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index c85fd3ae..0a58bc54 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -13,7 +13,6 @@
 #include "windows.h"
 #include "friendlist.h"
 
-static char *WINDOW_STATUS;
 
 typedef struct {
     uint8_t name[MAX_NAME_LENGTH];
@@ -48,17 +47,7 @@ void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str,
         return;
 
     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(m, new_chat(m, num), i);
-                break;
-            }
-        }
+        friends[num].chatwin = add_window(m, new_chat(m, num));
     }
 }
 
@@ -106,25 +95,9 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
     } 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) {
-                    set_active_window(i);
-                    break;
-                }
-            }
+            set_active_window(friends[num_selected].chatwin);
         } 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(m, new_chat(m, num_selected), i);
-                    break;
-                }
-            }
+            friends[num_selected].chatwin = add_window(m, new_chat(m, num_selected));
         }
     }
 }
@@ -172,9 +145,8 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
 
 }
 
-ToxWindow new_friendlist(char *ws)
+ToxWindow new_friendlist()
 {
-    WINDOW_STATUS = ws;
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));
 
diff --git a/testing/toxic/friendlist.h b/testing/toxic/friendlist.h
index f0c27f53..91b917fd 100644
--- a/testing/toxic/friendlist.h
+++ b/testing/toxic/friendlist.h
@@ -4,7 +4,7 @@
 #include "windows.h"
 #include "chat.h"
 
-ToxWindow new_friendlist(char *ws);
+ToxWindow new_friendlist();
 int friendlist_onFriendAdded(Messenger *m, int num);
 void disable_chatwin(int f_num);
 void fix_name(uint8_t *name);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 2da87bc6..9abe8de4 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -27,6 +27,7 @@
 
 /* Export for use in Callbacks */
 char *DATA_FILE = NULL;
+char *SRVLIST_FILE = NULL;
 
 void on_window_resize(int sig)
 {
@@ -74,10 +75,12 @@ static Messenger *init_tox()
     m_callback_action(m, on_action, NULL);
 #ifdef __linux__
     setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
+#elif defined(WIN32)
     setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
+#elif defined(__APPLE__)
+    setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters
 #else
-    setname(m, (uint8_t *) "Hipster", sizeof("Hipster"));
+    setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4"));
 #endif
     return m;
 }
@@ -89,14 +92,12 @@ static Messenger *init_tox()
 /* Connects to a random DHT server listed in the DHTservers file */
 int init_connection(void)
 {
+    FILE *fp = NULL;
+    
     if (DHT_isconnected())
         return 0;
 
-    #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
-        FILE *fp = fopen("DHTservers", "r");
-    #else
-        FILE *fp = fopen("~/.tox/DHTservers", "r"); 
-    #endif
+    fp = fopen(SRVLIST_FILE, "r");
 
     if (!fp)
         return 1;
@@ -290,11 +291,17 @@ int main(int argc, char *argv[])
 
         if (config_err) {
             DATA_FILE = strdup("data");
+            SRVLIST_FILE = strdup("../../other/DHTservers");
         } else {
             DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
             strcpy(DATA_FILE, user_config_dir);
             strcat(DATA_FILE, CONFIGDIR);
             strcat(DATA_FILE, "data");
+            
+            SRVLIST_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("DHTservers") + 1);
+            strcpy(SRVLIST_FILE, user_config_dir);
+            strcat(SRVLIST_FILE, CONFIGDIR);
+            strcat(SRVLIST_FILE, "DHTservers");
         }
     }
 
@@ -303,7 +310,6 @@ int main(int argc, char *argv[])
     init_term();
     Messenger *m = init_tox();
     ToxWindow *prompt = init_windows(m);
-    init_window_status();
 
     if (f_loadfromfile)
         load_data(m, DATA_FILE);
@@ -332,5 +338,6 @@ int main(int argc, char *argv[])
 
     cleanupMessenger(m);
     free(DATA_FILE);
+    free(SRVLIST_FILE);
     return 0;
 }
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index a37fdaaa..473633d4 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -19,7 +19,6 @@ extern int store_data(Messenger *m, char *path);
 uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests = 0; // XXX
 
-static friendAddedFn *on_friendadded_cb;
 static char prompt_buf[MAX_STR_SIZE] = {0};
 static int prompt_buf_pos = 0;
 
@@ -97,7 +96,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_cb(m, num);
+        on_friendadded(m, num);
     }
 }
 
@@ -174,7 +173,7 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
 
         default:
             wprintw(self->window, "Friend added as %d.\n", num);
-            on_friendadded_cb(m, num);
+            on_friendadded(m, num);
             break;
     }
 }
@@ -273,6 +272,7 @@ void cmd_nick(ToxWindow *self, Messenger *m, char **args)
     char *nick = args[1];
     setname(m, (uint8_t *) nick, strlen(nick) + 1);
     wprintw(self->window, "Nickname set to: %s\n", nick);
+
     if (store_data(m, DATA_FILE)) {
         wprintw(self->window, "\nCould not store Messenger data\n");
     }
@@ -480,9 +480,8 @@ static void prompt_onInit(ToxWindow *self, Messenger *m)
     wclrtoeol(self->window);
 }
 
-ToxWindow new_prompt(friendAddedFn *f)
+ToxWindow new_prompt()
 {
-    on_friendadded_cb = f;
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));
     ret.onKey = &prompt_onKey;
diff --git a/testing/toxic/prompt.h b/testing/toxic/prompt.h
index 6c5320ab..8e12a42f 100644
--- a/testing/toxic/prompt.h
+++ b/testing/toxic/prompt.h
@@ -3,9 +3,7 @@
 
 #include "windows.h"
 
-typedef void (friendAddedFn)(Messenger *m, int friendnumber);
-
-ToxWindow new_prompt(friendAddedFn *f);
+ToxWindow new_prompt();
 int add_req(uint8_t *public_key);
 unsigned char *hex_string_to_bin(char hex_string[]);
 
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
index 11396e2c..c0ff3026 100644
--- a/testing/toxic/windows.c
+++ b/testing/toxic/windows.c
@@ -6,15 +6,10 @@
 extern char *DATA_FILE;
 extern int store_data(Messenger *m, char *path);
 
-/* 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 windows[MAX_WINDOWS_NUM];
+static ToxWindow *active_window;
 static ToxWindow *prompt;
+static Messenger *m;
 
 /* CALLBACKS START */
 void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
@@ -31,7 +26,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userd
     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) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onFriendRequest != NULL)
             windows[i].onFriendRequest(&windows[i], public_key, data, length);
     }
@@ -41,7 +36,7 @@ void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length
 {
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onMessage != NULL)
             windows[i].onMessage(&windows[i], m, friendnumber, string, length);
     }
@@ -51,7 +46,7 @@ void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length,
 {
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onAction != NULL)
             windows[i].onAction(&windows[i], m, friendnumber, string, length);
     }
@@ -62,7 +57,7 @@ void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t len
     wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onNickChange != NULL)
             windows[i].onNickChange(&windows[i], friendnumber, string, length);
     }
@@ -73,7 +68,7 @@ void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t l
     wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onStatusChange != NULL)
             windows[i].onStatusChange(&windows[i], friendnumber, string, length);
     }
@@ -89,119 +84,89 @@ void on_friendadded(Messenger *m, int friendnumber)
 }
 /* CALLBACKS END */
 
-int add_window(Messenger *m, ToxWindow w, int n)
+int add_window(Messenger *m, ToxWindow w)
 {
-    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;
+ 
+    int i;
+    for(i = 0; i < MAX_WINDOWS_NUM; i++) {
+        if (windows[i].window) 
+            continue;
+        
+        w.window = newwin(LINES - 2, COLS, 0, 0);
+        if (w.window == NULL)
+            return -1;
+
+        windows[i] = w;
+        w.onInit(&w, m);
+    
+        active_window = windows+i;
+        return i;
+    }
+    
+    return -1;
 }
 
 /* Deletes window w and cleans up */
-void del_window(ToxWindow *w, int f_num)
+void del_window(ToxWindow *w)
 {
-    active_window = 0; // Go to prompt screen
+    active_window = windows; // 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;
-        }
-    }
-
+    if (w->x)
+        free(w->x);
+    w->window = NULL;
+    memset(w, 0, sizeof(ToxWindow));
     clear();
     refresh();
 }
 
 /* Shows next window when tab or back-tab is pressed */
-void set_active_window(int ch)
+void set_next_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);
-            }
+    ToxWindow *end = windows+MAX_WINDOWS_NUM-1;
+    ToxWindow *inf = active_window;
+    while(true) {
+        if (ch == '\t') {
+            if (++active_window > end)
+                active_window = windows;
+        } else 
+            if (--active_window < windows)
+                active_window = end;
+        
+        if (active_window->window)
+            return;
+    
+        if (active_window == inf) {    // infinite loop check
+            endwin();
+            exit(2);
         }
     }
 }
 
-void init_window_status()
+void set_active_window(int index)
 {
-    /* 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;
+    if (index < 0 || index >= MAX_WINDOWS_NUM)
+        return;
+    
+    active_window = windows+index;
 }
 
 ToxWindow *init_windows()
 {
-    w_num = 0;
-    int n_prompt = 0;
-    int n_friendslist = 1;
-    int n_dhtstatus = 2;
-
-    if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
-            || add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1
-            || add_window(m, new_dhtstatus(), n_dhtstatus) == -1) {
+    int n_prompt = add_window(m, new_prompt());
+    
+    if (n_prompt == -1
+            || add_window(m, new_friendlist()) == -1
+            || add_window(m, new_dhtstatus()) == -1) {
         fprintf(stderr, "add_window() failed.\n");
         endwin();
         exit(1);
     }
 
-    active_window = n_prompt;
     prompt = &windows[n_prompt];
+    active_window = prompt;
+    
     return prompt;
 }
 
@@ -222,9 +187,9 @@ static void draw_bar()
 
     int i;
 
-    for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
-        if (WINDOW_STATUS[i] != -1) {
-            if (i == active_window)
+    for (i = 0; i < (MAX_WINDOWS_NUM); ++i) {
+        if (windows[i].window) {
+            if (windows+i == active_window)
                 attron(A_BOLD);
 
             odd = (odd + 1) % blinkrate;
@@ -232,12 +197,13 @@ static void draw_bar()
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attron(COLOR_PAIR(3));
 
+            clrtoeol();
             printw(" %s", windows[i].title);
 
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attroff(COLOR_PAIR(3));
 
-            if (i == active_window) {
+            if (windows+i == active_window) {
                 attroff(A_BOLD);
             }
         }
@@ -255,7 +221,7 @@ void prepare_window(WINDOW *w)
 void draw_active_window(Messenger *m)
 {
 
-    ToxWindow *a = &windows[active_window];
+    ToxWindow *a = active_window;
     prepare_window(a->window);
     a->blink = false;
     draw_bar();
@@ -265,7 +231,7 @@ void draw_active_window(Messenger *m)
     int ch = getch();
 
     if (ch == '\t' || ch == KEY_BTAB)
-        set_active_window(ch);
+        set_next_window(ch);
     else if (ch != ERR)
         a->onKey(a, m, ch);
 }
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index 553a6200..be5557e9 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "../../core/Messenger.h"
-#define TOXWINDOWS_MAX_NUM 32
+#define MAX_WINDOWS_NUM 32
 #define MAX_FRIENDS_NUM 100
 #define MAX_STR_SIZE 256
 #define KEY_SIZE_BYTES 32
@@ -16,9 +16,6 @@
 /* number of permanent default windows */
 #define N_DEFAULT_WINS 3
 
-/* 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
@@ -48,11 +45,10 @@ void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length,
 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 on_friendadded(Messenger *m, int friendnumber);
-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);
+int add_window(Messenger *m, ToxWindow w);
+void del_window(ToxWindow *w);
 void set_active_window(int ch);
 #endif