From 374b7b9c6b6063ae0390ec18211cf8cfe75dd88d Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sat, 17 Aug 2013 19:26:31 -0700 Subject: [PATCH 1/9] Standarized DHTservers --- main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.c b/main.c index 816873b..6267751 100644 --- a/main.c +++ b/main.c @@ -88,7 +88,11 @@ int init_connection(void) if (DHT_isconnected()) return 0; - FILE *fp = fopen("../../../other/DHTservers", "r"); + #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) + FILE *fp = fopen("DHTservers", "r"); + #else + FILE *fp = fopen("~/.tox/DHTservers", "r"); + #endif if (!fp) return 1; From 1a8dce7905174de0925f093bacc807363420fa79 Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sat, 17 Aug 2013 19:43:10 -0700 Subject: [PATCH 2/9] Added more colors --- main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/main.c b/main.c index 6267751..1bb6cb5 100644 --- a/main.c +++ b/main.c @@ -52,6 +52,10 @@ static void init_term() init_pair(3, COLOR_RED, COLOR_BLACK); init_pair(4, COLOR_BLUE, COLOR_BLACK); init_pair(5, COLOR_YELLOW, COLOR_BLACK); + init_pair(6, COLOR_MAGENTA, COLOR_BLACK); + init_pair(7, COLOR_BLACK, COLOR_BLACK); + init_pair(8, COLOR_BLACK, COLOR_WHITE); + } refresh(); From 6196c1f4ebb07bb588f81af6d5d0eb908e51ce42 Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sat, 17 Aug 2013 20:57:35 -0700 Subject: [PATCH 3/9] Might improve windows detection --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index 1bb6cb5..2da87bc 100644 --- a/main.c +++ b/main.c @@ -74,7 +74,7 @@ static Messenger *init_tox() m_callback_action(m, on_action, NULL); #ifdef __linux__ setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); -#elif WIN32 +#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); #else setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); From ccfff8b3051afbd9c1f43e6e1b1d1ba67def2d0f Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sun, 18 Aug 2013 01:48:36 -0700 Subject: [PATCH 4/9] Ran it through astyle --- main.c | 10 +++++----- prompt.c | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main.c b/main.c index 2da87bc..c89f2f8 100644 --- a/main.c +++ b/main.c @@ -92,11 +92,11 @@ int init_connection(void) 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 +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) + FILE *fp = fopen("DHTservers", "r"); +#else + FILE *fp = fopen("~/.tox/DHTservers", "r"); +#endif if (!fp) return 1; diff --git a/prompt.c b/prompt.c index a37fdaa..e6c8851 100644 --- a/prompt.c +++ b/prompt.c @@ -273,6 +273,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"); } From e5dd681b285229b420e1bc167b821da89c2701b9 Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sun, 18 Aug 2013 03:12:55 -0700 Subject: [PATCH 5/9] Added windows support to the standarized location --- main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index c89f2f8..f9cb1b1 100644 --- a/main.c +++ b/main.c @@ -93,7 +93,7 @@ int init_connection(void) return 0; #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) - FILE *fp = fopen("DHTservers", "r"); + FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); #else FILE *fp = fopen("~/.tox/DHTservers", "r"); #endif From 145571610903a9d4d6fb1a47db20e605dec68128 Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sun, 18 Aug 2013 03:25:18 -0700 Subject: [PATCH 6/9] Added mac support with data, standarized data --- main.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/main.c b/main.c index f9cb1b1..52e810d 100644 --- a/main.c +++ b/main.c @@ -289,12 +289,28 @@ int main(int argc, char *argv[]) config_err = create_user_config_dir(user_config_dir); if (config_err) { - DATA_FILE = strdup("data"); + #if WIN32 + DATA_FILE = strdup("%appdata/.tox/data"); + #else + #if MAC_OSX + DATA_FILE = strdup("~Library/Application Support/data"); + #else + DATA_FILE = strdup("~/.tox/data"); + #endif + #endif } 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"); + #if WIN32 + DATA_FILE = strdup("%appdata/.tox/data"); + #else + #if MAC_OSX + DATA_FILE = strdup("~Library/Application Support/data"); + #else + DATA_FILE = strdup("~/.tox/data"); + #endif + #endif } } From 8f244f2b6d98fbafba5904f9b6a1993585d1223c Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sun, 18 Aug 2013 03:41:30 -0700 Subject: [PATCH 7/9] Added mac support to the standardized data file, cleaned up a bit --- main.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/main.c b/main.c index 52e810d..2ce2dbf 100644 --- a/main.c +++ b/main.c @@ -74,10 +74,10 @@ 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 win32 setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); #else - setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); + setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This implies users of other Unixes are hipsters #endif return m; } @@ -92,8 +92,10 @@ int init_connection(void) if (DHT_isconnected()) return 0; -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) +#if win32 FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); +#elif MAC_OSX + FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); #else FILE *fp = fopen("~/.tox/DHTservers", "r"); #endif @@ -291,26 +293,22 @@ int main(int argc, char *argv[]) if (config_err) { #if WIN32 DATA_FILE = strdup("%appdata/.tox/data"); - #else - #if MAC_OSX + #elif MAC_OSX DATA_FILE = strdup("~Library/Application Support/data"); #else DATA_FILE = strdup("~/.tox/data"); #endif - #endif } else { DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); strcpy(DATA_FILE, user_config_dir); strcat(DATA_FILE, CONFIGDIR); #if WIN32 DATA_FILE = strdup("%appdata/.tox/data"); - #else - #if MAC_OSX + #elif MAC_OSX DATA_FILE = strdup("~Library/Application Support/data"); #else DATA_FILE = strdup("~/.tox/data"); #endif - #endif } } From 4fe94ca403c182dce3dc598eaf0e700df773f771 Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sun, 18 Aug 2013 03:44:52 -0700 Subject: [PATCH 8/9] No longer assumes Minix/BSD/AIX users actually use Macs when assigning a default name --- main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.c b/main.c index 2ce2dbf..73a903d 100644 --- a/main.c +++ b/main.c @@ -76,8 +76,10 @@ static Messenger *init_tox() setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); #elif win32 setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); +#elif MAC_OSX + setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters #else - setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This implies users of other Unixes are hipsters + setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); #endif return m; } From 3c77156d6dc20799361609b7a6242a40140c38a1 Mon Sep 17 00:00:00 2001 From: Sean Qureshi Date: Sun, 18 Aug 2013 05:34:50 -0700 Subject: [PATCH 9/9] Fixed toxic not running --- main.c | 65 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/main.c b/main.c index 73a903d..04f6c4f 100644 --- a/main.c +++ b/main.c @@ -27,6 +27,7 @@ /* Export for use in Callbacks */ char *DATA_FILE = NULL; +char dir[31]; void on_window_resize(int sig) { @@ -35,6 +36,17 @@ void on_window_resize(int sig) clear(); } +void setdir() +{ + #ifdef WIN32 + strcpy(dir, "%appdata%/.tox/"); + #elif defined(MAC_OSX) + strcpy(dir, "~/Library/Application Support/.tox/"); + #elif defined(linux) + strcpy(dir, "~/.tox/"); + #endif +} + static void init_term() { /* Setup terminal */ @@ -72,15 +84,15 @@ static Messenger *init_tox() m_callback_namechange(m, on_nickchange, NULL); m_callback_statusmessage(m, on_statuschange, NULL); m_callback_action(m, on_action, NULL); -#ifdef __linux__ - setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); -#elif win32 - setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); -#elif MAC_OSX - setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters -#else - setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); -#endif + #ifdef __linux__ + setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); + #elif defined(WIN32) + setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); + #elif defined(MAC_OSX) + setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters + #else + setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); + #endif return m; } @@ -94,13 +106,13 @@ int init_connection(void) if (DHT_isconnected()) return 0; -#if win32 - FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); -#elif MAC_OSX - FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); -#else - FILE *fp = fopen("~/.tox/DHTservers", "r"); -#endif + #if WIN32 + FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); + #elif MAC_OSX + FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); + #else + FILE *fp = fopen("~/.tox/DHTservers", "r"); + #endif if (!fp) return 1; @@ -267,6 +279,7 @@ static void load_data(Messenger *m, char *path) int main(int argc, char *argv[]) { + setdir(); char *user_config_dir = get_user_config_dir(); int config_err = 0; @@ -293,24 +306,16 @@ int main(int argc, char *argv[]) config_err = create_user_config_dir(user_config_dir); if (config_err) { - #if WIN32 - DATA_FILE = strdup("%appdata/.tox/data"); - #elif MAC_OSX - DATA_FILE = strdup("~Library/Application Support/data"); - #else - DATA_FILE = strdup("~/.tox/data"); - #endif + strcat(DATA_FILE, dir); + DATA_FILE = strdup("data"); + + } else { DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); strcpy(DATA_FILE, user_config_dir); strcat(DATA_FILE, CONFIGDIR); - #if WIN32 - DATA_FILE = strdup("%appdata/.tox/data"); - #elif MAC_OSX - DATA_FILE = strdup("~Library/Application Support/data"); - #else - DATA_FILE = strdup("~/.tox/data"); - #endif + strcat(DATA_FILE, dir); + DATA_FILE = strdup("data"); } }