From f24eebaeed5ac6096744916298a94472e20cefce Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Wed, 28 Aug 2013 05:46:09 -0400 Subject: [PATCH 1/5] implemented friend deletion --- src/chat.c | 1 - src/friendlist.c | 113 +++++++++++++++++++++++++++++++++++++---------- src/windows.c | 2 +- 3 files changed, 91 insertions(+), 25 deletions(-) diff --git a/src/chat.c b/src/chat.c index 0054f90..9359095 100644 --- a/src/chat.c +++ b/src/chat.c @@ -119,7 +119,6 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1 wattroff(ctx->history, COLOR_PAIR(2)); status[len - 1] = '\0'; - 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); diff --git a/src/friendlist.c b/src/friendlist.c index 768ab7f..5d0e18d 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -9,17 +9,21 @@ #include #include #include +#include #include #include "friendlist.h" +extern char *DATA_FILE; +extern int store_data(Tox *m, char *path); typedef struct { uint8_t name[TOX_MAX_NAME_LENGTH]; uint8_t status[TOX_MAX_STATUSMESSAGE_LENGTH]; int num; int chatwin; + bool active; } friend_t; static friend_t friends[MAX_FRIENDS_NUM]; @@ -33,7 +37,7 @@ void friendlist_onMessage(ToxWindow *self, Tox *m, int num, uint8_t *str, uint16 return; if (friends[num].chatwin == -1) { - friends[num].chatwin = add_window(m, new_chat(m, num)); + friends[num].chatwin = add_window(m, new_chat(m, friends[num].num)); } } @@ -60,30 +64,87 @@ int friendlist_onFriendAdded(Tox *m, int num) if (num_friends == MAX_FRIENDS_NUM) return -1; - friends[num_friends].num = num; - tox_getname(m, num, friends[num_friends].name); - strcpy((char *) friends[num_friends].name, "unknown"); - strcpy((char *) friends[num_friends].status, "unknown"); - friends[num_friends++].chatwin = -1; - return 0; + int i; + + for (i = 0; i <= num_friends; ++i) { + if (!friends[i].active) { + friends[i].num = num; + friends[i].active = true; + friends[i].chatwin = -1; + tox_getname(m, num, friends[i].name); + strcpy((char *) friends[i].name, "unknown"); + strcpy((char *) friends[i].status, "unknown"); + + if (i == num_friends) + ++num_friends; + + return 0; + } + } + + return -1; +} + +static void select_friend(wint_t key) +{ + if (num_friends < 1) + return; + + int n = num_selected; + + if (key == KEY_UP) { + while (true) { + if (--n < 0) + n = num_friends-1; + if (friends[n].active) { + num_selected = n; + return; + } + } + } else if (key == KEY_DOWN) { + while (true) { + n = (n + 1) % num_friends; + if (friends[n].active) { + num_selected = n; + return; + } + } + } +} + +static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key) +{ + tox_delfriend(m, f_num); + memset(&(friends[f_num]), 0, sizeof(friend_t)); + friends[f_num].active = false; + + int i; + + for (i = num_friends; i != 0; --i) { + if (friends[i-1].active == true) + break; + } + + if (store_data(m, DATA_FILE)) + wprintw(self->window, "\nFailed to store messenger data\n"); + + num_friends = i; + select_friend(KEY_DOWN); } static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key) { - if (key == KEY_UP) { - 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; + if (key == KEY_UP || key == KEY_DOWN) { + select_friend(key); } else if (key == '\n') { /* Jump to chat window if already open */ if (friends[num_selected].chatwin != -1) { set_active_window(friends[num_selected].chatwin); } else { - friends[num_selected].chatwin = add_window(m, new_chat(m, num_selected)); + friends[num_selected].chatwin = add_window(m, new_chat(m, friends[num_selected].num)); } - } + } else if (key == 0x107 || key == 0x8 || key == 0x7f) + delete_friend(m, self, num_selected, key); } static void friendlist_onDraw(ToxWindow *self, Tox *m) @@ -95,25 +156,31 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m) wprintw(self->window, "Empty. Add some friends! :-)\n"); } else { wattron(self->window, COLOR_PAIR(2) | A_BOLD); - wprintw(self->window, "Open chat with.. (up/down keys, enter)\n"); + wprintw(self->window, " * Open chat with up/down keys and enter. "); + wprintw(self->window, "Delete friends with the backspace key\n"); wattroff(self->window, COLOR_PAIR(2) | A_BOLD); } wprintw(self->window, "\n"); + int i; for (i = 0; i < num_friends; ++i) { - if (i == num_selected) wattron(self->window, COLOR_PAIR(3)); + if (friends[i].active == true) { + if (i == num_selected) + wattron(self->window, COLOR_PAIR(3)); - wprintw(self->window, " [#%d] ", friends[i].num); + wprintw(self->window, " > ", friends[i].num); - if (i == num_selected) wattroff(self->window, COLOR_PAIR(3)); + if (i == num_selected) + wattroff(self->window, COLOR_PAIR(3)); - attron(A_BOLD); - wprintw(self->window, "%s ", friends[i].name); - attroff(A_BOLD); + attron(A_BOLD); + wprintw(self->window, "%s ", friends[i].name); + attroff(A_BOLD); - wprintw(self->window, "(%s)\n", friends[i].status); + wprintw(self->window, "(%s)\n", friends[i].status); + } } wrefresh(self->window); diff --git a/src/windows.c b/src/windows.c index ffa71f4..48b7fc2 100644 --- a/src/windows.c +++ b/src/windows.c @@ -195,7 +195,7 @@ static void draw_bar() int i; - for (i = 0; i < (MAX_WINDOWS_NUM); ++i) { + for (i = 0; i < MAX_WINDOWS_NUM; ++i) { if (windows[i].window) { if (windows + i == active_window) attron(A_BOLD); From c08639b8e1083e7d69a249023b8ed9cfcb7a9ba2 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Wed, 28 Aug 2013 05:53:47 -0400 Subject: [PATCH 2/5] small fixes --- src/friendlist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/friendlist.c b/src/friendlist.c index 5d0e18d..35c6295 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -73,7 +73,7 @@ int friendlist_onFriendAdded(Tox *m, int num) friends[i].chatwin = -1; tox_getname(m, num, friends[i].name); strcpy((char *) friends[i].name, "unknown"); - strcpy((char *) friends[i].status, "unknown"); + strcpy((char *) friends[i].status, "Offline"); if (i == num_friends) ++num_friends; @@ -121,7 +121,7 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key) int i; for (i = num_friends; i != 0; --i) { - if (friends[i-1].active == true) + if (friends[i-1].active) break; } @@ -166,11 +166,11 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m) int i; for (i = 0; i < num_friends; ++i) { - if (friends[i].active == true) { + if (friends[i].active) { if (i == num_selected) wattron(self->window, COLOR_PAIR(3)); - wprintw(self->window, " > ", friends[i].num); + wprintw(self->window, " > "); if (i == num_selected) wattroff(self->window, COLOR_PAIR(3)); From 4f2e80ef28b80b1d7c1c83e0963f6eb526a5ce58 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Wed, 28 Aug 2013 14:47:47 -0400 Subject: [PATCH 3/5] added infinite loop check --- src/friendlist.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/friendlist.c b/src/friendlist.c index 35c6295..6e420bf 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -61,7 +62,7 @@ void friendlist_onStatusChange(ToxWindow *self, int num, uint8_t *str, uint16_t int friendlist_onFriendAdded(Tox *m, int num) { - if (num_friends == MAX_FRIENDS_NUM) + if (num_friends < 0 || num_friends >= MAX_FRIENDS_NUM) return -1; int i; @@ -91,15 +92,19 @@ static void select_friend(wint_t key) return; int n = num_selected; + int f_inf = num_selected; if (key == KEY_UP) { while (true) { - if (--n < 0) - n = num_friends-1; + if (--n < 0) n = num_friends-1; if (friends[n].active) { num_selected = n; return; } + if (n == f_inf) { + endwin(); + exit(2); + } } } else if (key == KEY_DOWN) { while (true) { @@ -108,6 +113,10 @@ static void select_friend(wint_t key) num_selected = n; return; } + if (n == f_inf) { + endwin(); + exit(2); + } } } } @@ -120,7 +129,7 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key) int i; - for (i = num_friends; i != 0; --i) { + for (i = num_friends; i > 0; --i) { if (friends[i-1].active) break; } From 3d062ca15b15fe7d8b9fc601034bf37fdfce5892 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Thu, 29 Aug 2013 23:14:09 -0400 Subject: [PATCH 4/5] potential seg fault --- src/friendlist.c | 5 +---- src/windows.c | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/friendlist.c b/src/friendlist.c index 6e420bf..ab49b05 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -125,7 +125,6 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key) { tox_delfriend(m, f_num); memset(&(friends[f_num]), 0, sizeof(friend_t)); - friends[f_num].active = false; int i; @@ -166,12 +165,10 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m) } else { wattron(self->window, COLOR_PAIR(2) | A_BOLD); wprintw(self->window, " * Open chat with up/down keys and enter. "); - wprintw(self->window, "Delete friends with the backspace key\n"); + wprintw(self->window, "Delete friends with the backspace key\n\n"); wattroff(self->window, COLOR_PAIR(2) | A_BOLD); } - wprintw(self->window, "\n"); - int i; for (i = 0; i < num_friends; ++i) { diff --git a/src/windows.c b/src/windows.c index 48b7fc2..4319c00 100644 --- a/src/windows.c +++ b/src/windows.c @@ -121,10 +121,6 @@ void del_window(ToxWindow *w) { active_window = windows; // Go to prompt screen delwin(w->window); - - if (w->x) - free(w->x); - w->window = NULL; memset(w, 0, sizeof(ToxWindow)); clear(); From b99ce9ce46b40f86d63dcd4511d656b71780c74f Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 30 Aug 2013 20:13:29 -0400 Subject: [PATCH 5/5] proper fix for segfault, credit to manuel-arguelles --- src/chat.c | 32 +++++++++++++++++++------------- src/windows.c | 3 ++- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/chat.c b/src/chat.c index 9359095..2dd6950 100644 --- a/src/chat.c +++ b/src/chat.c @@ -212,10 +212,18 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key) wclear(ctx->linewin); wmove(self->window, y2 - CURS_Y_OFFSET, 0); wclrtobot(self->window); + bool close_win = false; - if (line[0] == '/') - execute(self, ctx, m, line); - else { + if (line[0] == '/') { + if (close_win = !strncmp(line, "/close", strlen("/close"))) { + int f_num = ctx->friendnum; + delwin(ctx->linewin); + del_window(self); + disable_chatwin(f_num); + } else { + execute(self, ctx, m, line); + } + } else { /* make sure the string has at least non-space character */ if (!string_is_empty(line)) { uint8_t selfname[TOX_MAX_NAME_LENGTH]; @@ -237,8 +245,13 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key) } } - ctx->line[0] = L'\0'; - ctx->pos = 0; + if (close_win) + free(ctx); + else { + ctx->line[0] = L'\0'; + ctx->pos = 0; + } + free(line); } } @@ -368,13 +381,6 @@ void execute(ToxWindow *self, ChatContext *ctx, Tox *m, char *cmd) wprintw(ctx->history, "%s\n", id); } - else if (strcmp(cmd, "/close") == 0) { - int f_num = ctx->friendnum; - delwin(ctx->linewin); - del_window(self); - disable_chatwin(f_num); - } - else wprintw(ctx->history, "Invalid command.\n"); } @@ -439,7 +445,7 @@ ToxWindow new_chat(Tox *m, int friendnum) snprintf(ret.title, sizeof(ret.title), "[%s (%d)]", nick, friendnum); ChatContext *x = calloc(1, sizeof(ChatContext)); + ret.x = x; x->friendnum = friendnum; - ret.x = (void *) x; return ret; } diff --git a/src/windows.c b/src/windows.c index 4319c00..e477928 100644 --- a/src/windows.c +++ b/src/windows.c @@ -120,9 +120,10 @@ int add_window(Tox *m, ToxWindow w) void del_window(ToxWindow *w) { active_window = windows; // Go to prompt screen + delwin(w->window); - w->window = NULL; memset(w, 0, sizeof(ToxWindow)); + clear(); refresh(); }