From 3bc7f15fe5a306ced566e1258ad4f9c4f89cd463 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 01:57:29 -0400 Subject: added ability to close and reopen chat windows & other minor changes --- testing/toxic/chat.c | 15 +++-- testing/toxic/friendlist.c | 40 +++++++---- testing/toxic/main.c | 161 ++++++++++++++++++++++++++++----------------- testing/toxic/prompt.c | 5 +- testing/toxic/windows.h | 8 +++ 5 files changed, 152 insertions(+), 77 deletions(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 936eb868..c11a7f12 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -25,6 +25,8 @@ typedef struct { } ChatContext; +extern void del_window(ToxWindow *w, int f_num); +extern int focus_window(int num); extern void fix_name(uint8_t* name); void print_help(ChatContext* self); void execute(ToxWindow* self, ChatContext* ctx, char* cmd); @@ -50,7 +52,7 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) fix_name(nick); wattron(ctx->history, COLOR_PAIR(2)); - wprintw(ctx->history, "%02d:%02d:%02d ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); + wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); wattroff(ctx->history, COLOR_PAIR(2)); wattron(ctx->history, COLOR_PAIR(4)); wprintw(ctx->history, "%s: ", nick); @@ -116,7 +118,7 @@ static void chat_onKey(ToxWindow* self, int key) { if(!string_is_empty(ctx->line)) { /* make sure the string has at least non-space character */ wattron(ctx->history, COLOR_PAIR(2)); - wprintw(ctx->history, "%02d:%02d:%02d ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); + wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); wattroff(ctx->history, COLOR_PAIR(2)); wattron(ctx->history, COLOR_PAIR(1)); wprintw(ctx->history, "you: ", ctx->line); @@ -185,6 +187,12 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd) } wprintw(ctx->history, "Your ID: %s\n", id); } + else if (strcmp(ctx->line, "/close") == 0) { + focus_window(0); // Go to prompt screen + int f_num = ctx->friendnum; + delwin(ctx->linewin); + del_window(self, f_num); + } else wprintw(ctx->history, "Invalid command.\n"); } @@ -256,6 +264,5 @@ ToxWindow new_chat(int friendnum) { x->friendnum = friendnum; ret.x = (void*) x; - free(x); return ret; -} +} \ No newline at end of file diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c index b4b619a2..2d060ae0 100644 --- a/testing/toxic/friendlist.c +++ b/testing/toxic/friendlist.c @@ -12,12 +12,11 @@ #include "windows.h" +extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM]; extern int add_window(ToxWindow w); extern int focus_window(int num); extern ToxWindow new_chat(int friendnum); -#define MAX_FRIENDS_NUM 100 - typedef struct { uint8_t name[MAX_NAME_LENGTH]; uint8_t status[MAX_USERSTATUS_LENGTH]; @@ -86,14 +85,11 @@ int friendlist_onFriendAdded(int num) { getname(num, friends[num_friends].name); strcpy((char*) friends[num_friends].name, "unknown"); strcpy((char*) friends[num_friends].status, "unknown"); - friends[num_friends].chatwin = -1; - - num_friends++; + friends[num_friends++].chatwin = -1; return 0; } static void friendlist_onKey(ToxWindow* self, int key) { - if(key == KEY_UP) { if(num_selected != 0) num_selected--; @@ -103,12 +99,26 @@ static void friendlist_onKey(ToxWindow* self, int key) { num_selected = (num_selected+1) % num_friends; } else if(key == '\n') { - - if(friends[num_selected].chatwin != -1) - return; - - friends[num_selected].chatwin = add_window(new_chat(num_selected)); - focus_window(friends[num_selected].chatwin); + /* 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) { + focus_window(i); + break; + } + } + }else { + friends[num_selected].chatwin = add_window(new_chat(num_selected)); + focus_window(friends[num_selected].chatwin); + int i; + for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { // Find open slot + if (WINDOW_STATUS[i] == -1) { + WINDOW_STATUS[i] = num_selected; + break; + } + } + } } } @@ -145,6 +155,10 @@ static void friendlist_onDraw(ToxWindow* self) { wrefresh(self->window); } +void disable_chatwin(int f_num) { + friends[f_num].chatwin = -1; +} + static void friendlist_onInit(ToxWindow* self) { } @@ -164,4 +178,4 @@ ToxWindow new_friendlist() { strcpy(ret.title, "[friends]"); return ret; -} +} \ No newline at end of file diff --git a/testing/toxic/main.c b/testing/toxic/main.c index e0e23708..e55cb85d 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -17,13 +17,12 @@ extern ToxWindow new_prompt(); extern ToxWindow new_friendlist(); extern int friendlist_onFriendAdded(int num); - +extern void disable_chatwin(int f_num); extern int add_req(uint8_t* public_key); // XXX -#define TOXWINDOWS_MAX_NUM 32 - -static ToxWindow windows[TOXWINDOWS_MAX_NUM]; -static int w_num; +char WINDOW_STATUS[MAX_WINDOW_SLOTS]; // Holds status of chat windows +static ToxWindow windows[MAX_WINDOW_SLOTS]; +int w_num; static int w_active; static ToxWindow* prompt; @@ -115,6 +114,16 @@ static void init_tox() { m_callback_userstatus(on_statuschange); } +void init_window_status() { + int i; + for (i = 0; i < N_DEFAULT_WINS; i++) + WINDOW_STATUS[i] = i; + + int j; + for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++) + WINDOW_STATUS[j] = -1; +} + int add_window(ToxWindow w) { if(w_num == TOXWINDOWS_MAX_NUM) return -1; @@ -133,6 +142,21 @@ int add_window(ToxWindow w) { return w_num - 1; } +/* 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(); +} + int focus_window(int num) { if(num >= w_num || num < 0) return -1; @@ -143,7 +167,6 @@ int focus_window(int num) { static void init_windows() { w_num = 0; - w_active = 0; if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) { fprintf(stderr, "add_window() failed.\n"); @@ -151,7 +174,6 @@ static void init_windows() { endwin(); exit(1); } - prompt = &windows[0]; } @@ -238,7 +260,6 @@ static void load_data(char *path) { static void draw_bar() { static int odd = 0; - size_t i; attron(COLOR_PAIR(4)); mvhline(LINES - 2, 0, '_', COLS); @@ -250,28 +271,26 @@ static void draw_bar() { printw(" TOXIC 1.0 |"); attroff(COLOR_PAIR(4) | A_BOLD); - for(i=0; i max) { // infinite loop check + endwin(); + clear(); + exit(2); + } + } + }else { + int i = w_active - 1; + if (i < 0) i = max; + while (true) { + if (WINDOW_STATUS[i] != -1) { + w_active = i; + return; + } + if (--i < 0) i = max; + if (f_inf++ > max) { + endwin(); + clear(); + exit(2); + } + } + } +} + int main(int argc, char* argv[]) { int ch; - int i = 0; - int f_flag = 0; - char *filename = "data"; ToxWindow* a; - for(i = 0; i < argc; i++) { - if(argv[i][0] == '-') { - if(argv[i][1] == 'f') { - if(argv[i + 1] != NULL) - filename = argv[i + 1]; - else { - f_flag = -1; - } - } - } - } - init_term(); init_tox(); - load_data(filename); + init_window_status(); init_windows(); + char *filename = "data"; + load_data(filename); - if(f_flag == -1) { - attron(COLOR_PAIR(3) | A_BOLD); - wprintw(prompt->window, "You passed '-f' without giving an argument!\n" + int i; + for(i = 0; i < argc; i++) { + if(argv[i][0] == '-' && argv[i][1] == 'f') { + if(argv[i + 1] != NULL) + filename = argv[i + 1]; + else { + attron(COLOR_PAIR(3) | A_BOLD); + wprintw(prompt->window, "You passed '-f' without giving an argument!\n" "defaulting to 'data' for a keyfile...\n"); - attroff(COLOR_PAIR(3) | A_BOLD); + attroff(COLOR_PAIR(3) | A_BOLD); + } + } } - - while(true) { // Update tox. do_tox(); @@ -325,18 +372,14 @@ int main(int argc, char* argv[]) { // Handle input. ch = getch(); - if(ch == '\t') { - w_active = (w_active + 1) % w_num; - } - else if(ch == KEY_BTAB) { - w_active = (w_active + w_num - 1) % w_num; + if(ch == '\t' || ch == KEY_BTAB) + set_active_window(ch); + else if(ch != ERR) { + a->onKey(a, ch); } else if(ch != ERR) { a->onKey(a, ch); } - } - return 0; -} - +} \ No newline at end of file diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c index 463b9352..d40fb2a6 100644 --- a/testing/toxic/prompt.c +++ b/testing/toxic/prompt.c @@ -254,7 +254,9 @@ static void execute(ToxWindow* self, char* cmd) { wprintw(self->window, "Message successfully sent.\n"); } } - + else if (!strncmp(cmd, "clear", strlen("clear"))) { + wclear(self->window); + } else { wprintw(self->window, "Invalid command.\n"); } @@ -314,6 +316,7 @@ static void print_usage(ToxWindow* self) { wprintw(self->window, " nick : Set your nickname\n"); wprintw(self->window, " accept : Accept friend request\n"); wprintw(self->window, " myid : Print your ID\n"); + wprintw(self->window, " clear : Clear the screen\n"); wprintw(self->window, " quit/exit : Exit program\n"); wprintw(self->window, " help : Print this message again\n"); diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h index dde1430f..cb45614d 100644 --- a/testing/toxic/windows.h +++ b/testing/toxic/windows.h @@ -3,6 +3,14 @@ */ #include +#define TOXWINDOWS_MAX_NUM 32 +#define MAX_FRIENDS_NUM 100 + +/* number of permanent default windows */ +#define N_DEFAULT_WINS 2 + +/* maximum window slots for WINDOW_STATUS array */ +#define MAX_WINDOW_SLOTS N_DEFAULT_WINS+MAX_FRIENDS_NUM typedef struct ToxWindow_ ToxWindow; -- cgit v1.2.3 From e479f338c18abdafae88c5f02b9996659d1fd6a7 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 02:32:50 -0400 Subject: test --- testing/toxic/chat.c | 4 +++- testing/toxic/main.c | 39 ++++++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index c11a7f12..eb297f7c 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -236,6 +236,7 @@ void print_help(ChatContext* self) { wprintw(self->history, " /nick : Set your nickname\n"); wprintw(self->history, " /myid : Print your ID\n"); wprintw(self->history, " /clear : Clear the screen\n"); + wprintw(self->history, " /close : Closes the current chat window\n"); wprintw(self->history, " /quit or /exit : Exit program\n"); wprintw(self->history, " /help : Print this message again\n\n"); @@ -264,5 +265,6 @@ ToxWindow new_chat(int friendnum) { x->friendnum = friendnum; ret.x = (void*) x; + free(x); return ret; -} \ No newline at end of file +} diff --git a/testing/toxic/main.c b/testing/toxic/main.c index e55cb85d..42657e88 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -337,28 +337,37 @@ void set_active_window(int ch) { int main(int argc, char* argv[]) { int ch; + int i = 0; + int f_flag = 0; + char *filename = "data"; ToxWindow* a; + for(i = 0; i < argc; i++) { + if (argv[i] == NULL){ + break; + } else if(argv[i][0] == '-') { + if(argv[i][1] == 'f') { + if(argv[i + 1] != NULL) + filename = argv[i + 1]; + else { + f_flag = -1; + } + } + } + } + init_term(); init_tox(); - init_window_status(); - init_windows(); - char *filename = "data"; load_data(filename); + init_windows(); - int i; - for(i = 0; i < argc; i++) { - if(argv[i][0] == '-' && argv[i][1] == 'f') { - if(argv[i + 1] != NULL) - filename = argv[i + 1]; - else { - attron(COLOR_PAIR(3) | A_BOLD); - wprintw(prompt->window, "You passed '-f' without giving an argument!\n" + if(f_flag == -1) { + attron(COLOR_PAIR(3) | A_BOLD); + wprintw(prompt->window, "You passed '-f' without giving an argument!\n" "defaulting to 'data' for a keyfile...\n"); - attroff(COLOR_PAIR(3) | A_BOLD); - } - } + attroff(COLOR_PAIR(3) | A_BOLD); } + while(true) { // Update tox. do_tox(); @@ -382,4 +391,4 @@ int main(int argc, char* argv[]) { } } return 0; -} \ No newline at end of file +} -- cgit v1.2.3 From 29880b4299a1eedcf1b8c732925a088b54be1358 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 02:48:59 -0400 Subject: init array --- testing/toxic/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 42657e88..c8cf73ed 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -360,6 +360,7 @@ int main(int argc, char* argv[]) { init_tox(); load_data(filename); init_windows(); + init_window_status(); if(f_flag == -1) { attron(COLOR_PAIR(3) | A_BOLD); -- cgit v1.2.3 From 4b76983a692e0234b220b1c8fee87edb12673be2 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 16:04:06 -0400 Subject: chat window deleting and re-adding - it just werks --- testing/toxic/chat.c | 6 +++--- testing/toxic/friendlist.c | 27 +++++++++++++++++++-------- testing/toxic/main.c | 41 +++++++++++++++++------------------------ testing/toxic/prompt.c | 9 ++++----- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 2c1f1072..5d0e14ad 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -25,8 +25,8 @@ typedef struct { } ChatContext; +extern int w_active; extern void del_window(ToxWindow *w, int f_num); -extern int focus_window(int num); extern void fix_name(uint8_t* name); void print_help(ChatContext* self); void execute(ToxWindow* self, ChatContext* ctx, char* cmd); @@ -188,7 +188,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd) wprintw(ctx->history, "Your ID: %s\n", id); } else if (strcmp(ctx->line, "/close") == 0) { - focus_window(0); // Go to prompt screen + w_active = 0; // Go to prompt screen int f_num = ctx->friendnum; delwin(ctx->linewin); del_window(self, f_num); @@ -236,7 +236,7 @@ void print_help(ChatContext* self) { wprintw(self->history, " /nick : Set your nickname\n"); wprintw(self->history, " /myid : Print your ID\n"); wprintw(self->history, " /clear : Clear the screen\n"); - wprintw(self->history, " /close : Closes the current chat window\n"); + wprintw(self->history, " /close : Close the current chat window\n"); wprintw(self->history, " /quit or /exit : Exit program\n"); wprintw(self->history, " /help : Print this message again\n\n"); diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c index 2d060ae0..647f563d 100644 --- a/testing/toxic/friendlist.c +++ b/testing/toxic/friendlist.c @@ -13,9 +13,9 @@ #include "windows.h" extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM]; -extern int add_window(ToxWindow w); -extern int focus_window(int num); +extern int add_window(ToxWindow w, int n); extern ToxWindow new_chat(int friendnum); +extern int w_active; typedef struct { uint8_t name[MAX_NAME_LENGTH]; @@ -52,7 +52,17 @@ void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len) return; if(friends[num].chatwin == -1) { - friends[num].chatwin = add_window(new_chat(num)); + 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(new_chat(num_selected), i); + w_active = i; + break; + } + } } } @@ -104,17 +114,18 @@ static void friendlist_onKey(ToxWindow* self, int key) { int i; for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { if (WINDOW_STATUS[i] == num_selected) { - focus_window(i); + w_active = i; break; } } }else { - friends[num_selected].chatwin = add_window(new_chat(num_selected)); - focus_window(friends[num_selected].chatwin); int i; - for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { // Find open slot + 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(new_chat(num_selected), i); + w_active = i; break; } } @@ -178,4 +189,4 @@ ToxWindow new_friendlist() { strcpy(ret.title, "[friends]"); return ret; -} \ No newline at end of file +} diff --git a/testing/toxic/main.c b/testing/toxic/main.c index c8cf73ed..892f812a 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -23,7 +23,7 @@ extern int add_req(uint8_t* public_key); // XXX char WINDOW_STATUS[MAX_WINDOW_SLOTS]; // Holds status of chat windows static ToxWindow windows[MAX_WINDOW_SLOTS]; int w_num; -static int w_active; +int w_active; static ToxWindow* prompt; // CALLBACKS START @@ -40,7 +40,7 @@ void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) { wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n); - for(i=0; iwindow, "\n(message) %d: %s\n", friendnumber, string); - for(i=0; iwindow, "\n(nickchange) %d: %s!\n", friendnumber, string); - for(i=0; iwindow, "\n(statuschange) %d: %s!\n", friendnumber, string); - for(i=0; i= 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[w_num++] = w; + windows[n] = w; w.onInit(&w); - - return w_num - 1; + w_num++; + return n; } /* Deletes window w and cleans up */ @@ -157,24 +157,17 @@ void del_window(ToxWindow *w, int f_num) { refresh(); } -int focus_window(int num) { - if(num >= w_num || num < 0) - return -1; - - w_active = num; - return 0; -} - static void init_windows() { w_num = 0; - - if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) { + 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[0]; + prompt = &windows[n_prompt]; } static void do_tox() { diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c index d40fb2a6..f973afd7 100644 --- a/testing/toxic/prompt.c +++ b/testing/toxic/prompt.c @@ -158,7 +158,9 @@ static void execute(ToxWindow* self, char* cmd) { break; } } - + else if (!strcmp(cmd, "clear")) { + wclear(self->window); + } else if(!strcmp(cmd, "help")) { print_usage(self); } @@ -254,9 +256,6 @@ static void execute(ToxWindow* self, char* cmd) { wprintw(self->window, "Message successfully sent.\n"); } } - else if (!strncmp(cmd, "clear", strlen("clear"))) { - wclear(self->window); - } else { wprintw(self->window, "Invalid command.\n"); } @@ -316,7 +315,7 @@ static void print_usage(ToxWindow* self) { wprintw(self->window, " nick : Set your nickname\n"); wprintw(self->window, " accept : Accept friend request\n"); wprintw(self->window, " myid : Print your ID\n"); - wprintw(self->window, " clear : Clear the screen\n"); + wprintw(self->window, " clear : Clear this window\n"); wprintw(self->window, " quit/exit : Exit program\n"); wprintw(self->window, " help : Print this message again\n"); -- cgit v1.2.3 From 16a74ffaf991ffed364fce823c1689eb68b26bc9 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 16:34:55 -0400 Subject: list commands on chat window popup --- testing/toxic/chat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 5d0e14ad..175c6b05 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -225,11 +225,12 @@ static void chat_onInit(ToxWindow* self) { scrollok(ctx->history, 1); ctx->linewin = subwin(self->window, 2, x, y - 3, 0); + print_help(ctx); } void print_help(ChatContext* self) { wattron(self->history, COLOR_PAIR(2) | A_BOLD); - wprintw(self->history, "\nCommands:\n"); + wprintw(self->history, "Commands:\n"); wattroff(self->history, A_BOLD); wprintw(self->history, " /status : Set your status\n"); -- cgit v1.2.3 From 3f712d2650937c78735375f9695d73a8dbc95a91 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 18:07:08 -0400 Subject: bug fix and added wrapping on friends list --- testing/toxic/friendlist.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c index 647f563d..a1f9851e 100644 --- a/testing/toxic/friendlist.c +++ b/testing/toxic/friendlist.c @@ -58,11 +58,11 @@ void friendlist_onMessage(ToxWindow* self, int num, uint8_t* str, uint16_t len) for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; i++) { if (WINDOW_STATUS[i] == -1) { WINDOW_STATUS[i] = num; - add_window(new_chat(num_selected), i); + add_window(new_chat(num), i); w_active = i; break; - } } + } } } @@ -101,8 +101,9 @@ int friendlist_onFriendAdded(int num) { static void friendlist_onKey(ToxWindow* self, int key) { if(key == KEY_UP) { - if(num_selected != 0) - num_selected--; + num_selected--; + if (num_selected < 0) + num_selected = num_friends-1; } else if(key == KEY_DOWN) { if(num_friends != 0) -- cgit v1.2.3 From 663764e046fa7f83d03138e370ba074fc851909d Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 5 Aug 2013 18:38:55 -0400 Subject: spacing didn't match outgoing msgs --- testing/toxic/chat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 175c6b05..15d124bc 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c @@ -52,7 +52,7 @@ static void chat_onMessage(ToxWindow* self, int num, uint8_t* msg, uint16_t len) fix_name(nick); wattron(ctx->history, COLOR_PAIR(2)); - wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); + wprintw(ctx->history, "[%02d:%02d:%02d] ", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec); wattroff(ctx->history, COLOR_PAIR(2)); wattron(ctx->history, COLOR_PAIR(4)); wprintw(ctx->history, "%s: ", nick); -- cgit v1.2.3