8 files changed, 232 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 47cfd84a..07480699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,6 @@ tags
 *.exe
 *.out
 *.app
+
+#netbeans
+nbproject
diff --git a/core/Messenger.c b/core/Messenger.c
index bf87a3e4..af4fd797 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -55,6 +55,8 @@ static Friend *friendlist;
 static uint32_t numfriends;
 
 
+static void set_friend_status(int friendnumber, uint8_t status);
+
 /* 1 if we are online
    0 if we are offline
    static uint8_t online; */
@@ -134,7 +136,7 @@ int m_addfriend(uint8_t *client_id, uint8_t *data, uint16_t length)
     for (i = 0; i <= numfriends; ++i)  {
         if (friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
-            friendlist[i].status = FRIEND_ADDED;
+            set_friend_status(i, FRIEND_ADDED);
             friendlist[i].crypt_connection_id = -1;
             friendlist[i].friend_request_id = -1;
             memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);
@@ -165,7 +167,7 @@ int m_addfriend_norequest(uint8_t * client_id)
     for (i = 0; i <= numfriends; ++i) {
         if(friendlist[i].status == NOFRIEND) {
             DHT_addfriend(client_id);
-            friendlist[i].status = FRIEND_REQUESTED;
+            set_friend_status(i, FRIEND_REQUESTED);
             friendlist[i].crypt_connection_id = -1;
             friendlist[i].friend_request_id = -1;
             memcpy(friendlist[i].client_id, client_id, CLIENT_ID_SIZE);
@@ -500,6 +502,21 @@ void m_callback_read_receipt(void (*function)(int, uint32_t))
     read_receipt_isset = 1;
 }
 
+static void (*friend_statuschange)(int, uint8_t);
+static uint8_t friend_statuschange_isset = 0;
+void m_callback_friend_status(void (*function)(int, uint8_t))
+{
+    friend_statuschange = function;
+    friend_statuschange_isset = 1;
+}
+
+static void set_friend_status(int friendnumber, uint8_t status)
+{
+    if (friendlist[friendnumber].status != status && friend_statuschange_isset)
+        friend_statuschange(friendnumber, status);
+    friendlist[friendnumber].status = status;
+}
+
 #define PORT 33445
 /* run this at startup */
 int initMessenger(void)
@@ -527,9 +544,9 @@ static void doFriends(void)
         if (friendlist[i].status == FRIEND_ADDED) {
             int fr = send_friendrequest(friendlist[i].client_id, friendlist[i].info, friendlist[i].info_size);
             if (fr == 0) /* TODO: This needs to be fixed so that it sends the friend requests a couple of times in case of packet loss */
-                friendlist[i].status = FRIEND_REQUESTED;
+                set_friend_status(i, FRIEND_REQUESTED);
             else if (fr > 0)
-                friendlist[i].status = FRIEND_REQUESTED;
+                set_friend_status(i, FRIEND_REQUESTED);
         }
         if (friendlist[i].status == FRIEND_REQUESTED || friendlist[i].status == FRIEND_CONFIRMED) { /* friend is not online */
             if (friendlist[i].status == FRIEND_REQUESTED) {
@@ -545,7 +562,7 @@ static void doFriends(void)
                     friendlist[i].crypt_connection_id = crypto_connect(friendlist[i].client_id, friendip);
                 break;
             case 3: /*  Connection is established */
-                friendlist[i].status = FRIEND_ONLINE;
+                set_friend_status(i, FRIEND_ONLINE);
                 break;
             case 4:
                 crypto_kill(friendlist[i].crypt_connection_id);
@@ -632,7 +649,7 @@ static void doFriends(void)
                 if (is_cryptoconnected(friendlist[i].crypt_connection_id) == 4) { /* if the connection timed out, kill it */
                     crypto_kill(friendlist[i].crypt_connection_id);
                     friendlist[i].crypt_connection_id = -1;
-                    friendlist[i].status = FRIEND_CONFIRMED;
+                    set_friend_status(i, FRIEND_CONFIRMED);
                 }
                 break;
             }
@@ -653,7 +670,7 @@ static void doInbound(void)
             friendlist[friend_id].crypt_connection_id =
                 accept_crypto_inbound(inconnection, public_key, secret_nonce, session_key);
 
-            friendlist[friend_id].status = FRIEND_CONFIRMED;
+            set_friend_status(friend_id, FRIEND_CONFIRMED);
         }
     }
 }
diff --git a/core/Messenger.h b/core/Messenger.h
index 40d02f46..55c86682 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -211,6 +211,10 @@ void m_callback_userstatus(void (*function)(int, USERSTATUS));
     in that case, you should discard it. */
 void m_callback_read_receipt(void (*function)(int, uint32_t));
 
+/* set the callback for friend status changes
+    function(int friendnumber, uint8_t status) */
+void m_callback_friendstatus(void (*function)(int, uint8_t));
+
 /* run this at startup
     returns 0 if no connection problems
     returns -1 if there are problems */
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index d9d695a5..d2642df1 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -416,7 +416,7 @@ int main(int argc, char *argv[])
     m_callback_friendrequest(print_request);
     m_callback_friendmessage(print_message);
     m_callback_namechange(print_nickchange);
-    m_callback_statusmessae(print_statuschange);
+    m_callback_statusmessage(print_statuschange);
     char idstring1[PUB_KEY_BYTES][5];
     char idstring2[PUB_KEY_BYTES][5];
     int i;
diff --git a/testing/toxic/CMakeLists.txt b/testing/toxic/CMakeLists.txt
index 38f02dc6..13b8692d 100644
--- a/testing/toxic/CMakeLists.txt
+++ b/testing/toxic/CMakeLists.txt
@@ -10,7 +10,8 @@ add_executable(${exe_name}
         main.c
         prompt.c
         friendlist.c
-        chat.c)
+        chat.c
+        configdir.c)
 
 target_link_libraries(${exe_name}
         curses)
diff --git a/testing/toxic/configdir.c b/testing/toxic/configdir.c
new file mode 100644
index 00000000..d91d0804
--- /dev/null
+++ b/testing/toxic/configdir.c
@@ -0,0 +1,136 @@
+/*
+ *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#ifdef WIN32
+#include <shlobj.h>
+#include <direct.h>
+#endif
+
+#ifdef __APPLE__
+#include <unistd.h>
+#include <pwd.h>
+#endif
+
+#include "configdir.h"
+
+/*
+ * Retrieves a correct configuration directory, depending on the OS used, with a trailing slash
+ */
+char *get_user_config_dir(void)
+{
+  char *user_config_dir;
+
+  #ifdef WIN32
+
+  char appdata[MAX_PATH];
+  HRESULT result = SHGetFolderPath(
+    NULL,
+    CSIDL_APPDATA,
+    NULL,
+    SHGFP_TYPE_CURRENT,
+    appdata
+  )
+  if (!result) return NULL;
+
+  user_config_dir = strdup(appdata);
+
+  return user_config_dir;
+
+  #elif defined __APPLE__
+
+  struct passwd *pass = getpwuid(getuid());
+  if (!pass) return NULL;
+  char *home = pass->pw_dir;
+  user_config_dir = malloc(strlen(home) + strlen("/Library/Application Support") + 1);
+  
+  if(user_config_dir) {
+    strcpy(user_config_dir, home);
+    strcat(user_config_dir, "/Library/Application Support");
+  }
+  return user_config_dir;
+
+  #else
+
+  if (getenv("XDG_CONFIG_HOME")) {
+    user_config_dir = strdup(getenv("XDG_CONFIG_HOME"));
+  } else {
+    user_config_dir = malloc(strlen(getenv("HOME")) + strlen("/.config") + 1);
+    if (user_config_dir) {
+      strcpy(user_config_dir, getenv("HOME"));
+      strcat(user_config_dir, "/.config");
+    }
+  }
+  return user_config_dir;
+
+  #endif
+}
+
+/*
+ * Creates the config directory.
+ */
+int create_user_config_dir(char *path)
+{ 
+
+  int mkdir_err;
+
+  #ifdef WIN32
+
+  char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
+  strcpy(fullpath, path);
+  strcat(fullpath, CONFIGDIR);
+
+  mkdir_err = _mkdir(fullpath);
+  struct __stat64 buf;
+  if (mkdir_err && (errno != EEXIST || _wstat64(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
+    free(fullpath);
+    return -1;
+  }
+
+  #else
+
+  mkdir_err = mkdir(path, 0700);
+  struct stat buf;
+
+  if(mkdir_err && (errno != EEXIST || stat(path, &buf) || !S_ISDIR(buf.st_mode))) {
+    return -1;
+  }
+
+  char *fullpath = malloc(strlen(path) + strlen(CONFIGDIR) + 1);
+  strcpy(fullpath, path);
+  strcat(fullpath, CONFIGDIR);
+
+  mkdir_err = mkdir(fullpath, 0700);
+
+  if(mkdir_err && (errno != EEXIST || stat(fullpath, &buf) || !S_ISDIR(buf.st_mode))) {
+    free(fullpath);
+    return -1;
+  }
+  
+  #endif
+
+  return 0;
+}
diff --git a/testing/toxic/configdir.h b/testing/toxic/configdir.h
new file mode 100644
index 00000000..fad949cf
--- /dev/null
+++ b/testing/toxic/configdir.h
@@ -0,0 +1,33 @@
+/*
+ *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifdef _win32
+#define CONFIGDIR "\\toxic\\"
+#else
+#define CONFIGDIR "/toxic/"
+#endif
+ 
+#ifndef S_ISDIR
+#define S_ISDIR(mode)  (((mode) & S_IFMT) == S_IFDIR)
+#endif
+
+char *get_user_config_dir(void);
+
+int create_user_config_dir(char *path);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index d5999eb2..2922456e 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -3,14 +3,23 @@
  */
 
 #include <curses.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef _win32
+#include <direct.h>
+#else
+#include <sys/stat.h>
+#include <sys/types.h>
+#endif
+
 #include "../../core/Messenger.h"
 #include "../../core/network.h"
 
+#include "configdir.h"
 #include "windows.h"
 
 extern ToxWindow new_prompt();
@@ -342,9 +351,19 @@ int main(int argc, char *argv[])
 {
   int ch;
   int f_flag = 0;
-  char *filename = "data";
+  char *user_config_dir = get_user_config_dir();
+  char *filename;
+  int config_err = create_user_config_dir(user_config_dir);
+  if(config_err) {
+    filename = "data";
+  } else {
+    filename = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
+    strcpy(filename, user_config_dir);
+    strcat(filename, CONFIGDIR);
+    strcat(filename, "data");
+  }
+  
   ToxWindow* a;
-
   int i = 0;
   for (i = 0; i < argc; ++i) {
     if (argv[i] == NULL)
@@ -362,6 +381,7 @@ int main(int argc, char *argv[])
   init_term();
   init_tox();
   load_data(filename);
+  free(filename);
   init_windows();
   init_window_status();
 
@@ -371,6 +391,13 @@ int main(int argc, char *argv[])
                             "defaulting to 'data' for a keyfile...\n");
     attroff(COLOR_PAIR(3) | A_BOLD);
   }
+
+  if(config_err) {
+    attron(COLOR_PAIR(3) | A_BOLD);
+    wprintw(prompt->window, "Unable to determine configuration directory!\n"
+                            "defaulting to 'data' for a keyfile...\n");
+    attroff(COLOR_PAIR(3) | A_BOLD);
+  }
   
   while(true) {
     /* Update tox */