Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 06:03:04 +01:00
Code Issues Projects Releases Wiki Activity

slight refactor of select_friend() and fix mistake

Browse Source
This commit is contained in:
Jfreegman 2013-09-04 17:22:16 -04:00
parent f93af40f28
commit 2f93081a42
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/friendlist.c
View File

@ -75,8 +75,6 @@ int friendlist_onFriendAdded(Tox *m, int num)
if (tox_getname(m, num, friends[i].name) != 0 || friends[i].name[0] == '\0') if (tox_getname(m, num, friends[i].name) != 0 || friends[i].name[0] == '\0')
strcpy((char *) friends[i].name, "unknown"); strcpy((char *) friends[i].name, "unknown");
tox_set_statusmessage(m, "\0", strlen("\0"));
if (i == num_friends) if (i == num_friends)
++num_friends; ++num_friends;
@ -87,39 +85,34 @@ int friendlist_onFriendAdded(Tox *m, int num)
return -1; return -1;
} }
static void select_friend(wint_t key) static void select_friend(Tox *m, wint_t key)
{ {
if (num_friends < 1) if (num_friends < 1)
return; return;
int n = num_selected; int n = num_selected;
int f_inf = num_selected;
if (key == KEY_UP) { if (key == KEY_UP) {
while (true) { while (--n != num_selected) {
if (--n < 0) n = num_friends-1; if (n < 0) n = num_friends - 1;
if (friends[n].active) { if (friends[n].active) {
num_selected = n; num_selected = n;
return; return;
} }
if (n == f_inf) {
endwin();
exit(2);
}
} }
} else if (key == KEY_DOWN) { } else if (key == KEY_DOWN) {
while (true) { while ((n = (n + 1) % num_friends) != num_selected) {
n = (n + 1) % num_friends;
if (friends[n].active) { if (friends[n].active) {
num_selected = n; num_selected = n;
return; return;
} }
if (n == f_inf) { }
} else return; /* Bad key input */
/* If we reach this something is wrong */
endwin(); endwin();
tox_kill(m);
exit(2); exit(2);
}
}
}
} }
static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key) static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
@ -138,13 +131,13 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
wprintw(self->window, "\nFailed to store messenger data\n"); wprintw(self->window, "\nFailed to store messenger data\n");
num_friends = i; num_friends = i;
select_friend(KEY_DOWN); select_friend(m, KEY_DOWN);
} }
static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key) static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key)
{ {
if (key == KEY_UP || key == KEY_DOWN) { if (key == KEY_UP || key == KEY_DOWN) {
select_friend(key); select_friend(m, key);
} else if (key == '\n') { } else if (key == '\n') {
/* Jump to chat window if already open */ /* Jump to chat window if already open */
if (friends[num_selected].chatwin != -1) { if (friends[num_selected].chatwin != -1) {
@ -174,14 +167,12 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
for (i = 0; i < num_friends; ++i) { for (i = 0; i < num_friends; ++i) {
if (friends[i].active) { if (friends[i].active) {
bool is_online = tox_friendstatus(m, friends[i].num) == TOX_FRIEND_ONLINE;
if (i == num_selected) if (i == num_selected)
wprintw(self->window, " > "); wprintw(self->window, " > ");
else else
wprintw(self->window, " "); wprintw(self->window, " ");
if (is_online) { if (tox_friendstatus(m, friends[i].num) == TOX_FRIEND_ONLINE) {
TOX_USERSTATUS status = tox_get_userstatus(m, friends[i].num); TOX_USERSTATUS status = tox_get_userstatus(m, friends[i].num);
int colour = 7; /* Invalid or other errors default to black */ int colour = 7; /* Invalid or other errors default to black */
@ -203,7 +194,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
wattroff(self->window, COLOR_PAIR(colour)); wattroff(self->window, COLOR_PAIR(colour));
wprintw(self->window, "] %s", friends[i].name); wprintw(self->window, "] %s", friends[i].name);
if (friends[i].statusmsg[0] != '\0') if (friends[i].statusmsg[0])
wprintw(self->window, " (%s)\n", friends[i].statusmsg); wprintw(self->window, " (%s)\n", friends[i].statusmsg);
else else
wprintw(self->window, "\n"); wprintw(self->window, "\n");