From 16b3ec746e9ab518a1efa221524391f8f692f75b Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Tue, 6 Aug 2013 18:27:51 -0400 Subject: code format/clean up --- testing/toxic/main.c | 217 +++++++++++++++++++++++++-------------------------- 1 file changed, 106 insertions(+), 111 deletions(-) (limited to 'testing/toxic/main.c') diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 19a0b959..1ba8b6c9 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c @@ -18,106 +18,108 @@ 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 +extern int add_req(uint8_t *public_key); // XXX + +/* Holds status of chat windows */ +char WINDOW_STATUS[MAX_WINDOW_SLOTS]; -char WINDOW_STATUS[MAX_WINDOW_SLOTS]; // Holds status of chat windows static ToxWindow windows[MAX_WINDOW_SLOTS]; -int w_num; -int w_active; static ToxWindow* prompt; -// CALLBACKS START -void on_request(uint8_t* public_key, uint8_t* data, uint16_t length) { - size_t i; - int n = add_req(public_key); +int w_num; +int active_window; +/* CALLBACKS START */ +void on_request(uint8_t *public_key, uint8_t *data, uint16_t length) +{ + int n = add_req(public_key); wprintw(prompt->window, "\nFriend request from:\n"); - for(i=0; i<32; i++) { + int i; + for (i = 0; i < 32; ++i) { wprintw(prompt->window, "%02x", public_key[i] & 0xff); } - wprintw(prompt->window, "\n"); + wprintw(prompt->window, "\n"); 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) +int add_window(ToxWindow w, int n) +{ + if (w_num >= TOXWINDOWS_MAX_NUM) return -1; - if(LINES < 2) + if (LINES < 2) return -1; w.window = newwin(LINES - 2, COLS, 0, 0); - if(w.window == NULL) + if (w.window == NULL) return -1; windows[n] = w; @@ -143,10 +146,11 @@ int add_window(ToxWindow w, int n) { } /* Deletes window w and cleans up */ -void del_window(ToxWindow *w, int f_num) { +void del_window(ToxWindow *w, int f_num) +{ delwin(w->window); int i; - for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; 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); @@ -157,11 +161,12 @@ void del_window(ToxWindow *w, int f_num) { refresh(); } -static void init_windows() { +static void init_windows() +{ w_num = 0; int n_prompt = 0; int n_friendslist = 1; - if(add_window(new_prompt(), n_prompt) == -1 + if (add_window(new_prompt(), n_prompt) == -1 || add_window(new_friendlist(), n_friendslist) == -1) { fprintf(stderr, "add_window() failed.\n"); endwin(); @@ -170,88 +175,79 @@ static void init_windows() { prompt = &windows[n_prompt]; } -static void do_tox() { +static void do_tox() +{ static bool dht_on = false; - - if(!dht_on && DHT_isconnected()) { + if (!dht_on && DHT_isconnected()) { dht_on = true; wprintw(prompt->window, "\nDHT connected!\n"); } - else if(dht_on && !DHT_isconnected()) { + else if (dht_on && !DHT_isconnected()) { dht_on = false; wprintw(prompt->window, "\nDHT disconnected!\n"); } - doMessenger(); } -static void load_data(char *path) { - FILE* fd; +static void load_data(char *path) +{ + FILE *fd; size_t len; - uint8_t* buf; + uint8_t *buf; - if((fd = fopen(path, "r")) != NULL) { + if ((fd = fopen(path, "r")) != NULL) { fseek(fd, 0, SEEK_END); len = ftell(fd); fseek(fd, 0, SEEK_SET); buf = malloc(len); - - if(buf == NULL) { + if (buf == NULL) { fprintf(stderr, "malloc() failed.\n"); - fclose(fd); endwin(); exit(1); } - - if(fread(buf, len, 1, fd) != 1){ + if (fread(buf, len, 1, fd) != 1){ fprintf(stderr, "fread() failed.\n"); - free(buf); fclose(fd); endwin(); exit(1); } - Messenger_load(buf, len); } else { len = Messenger_size(); buf = malloc(len); - - if(buf == NULL) { + if (buf == NULL) { fprintf(stderr, "malloc() failed.\n"); endwin(); exit(1); } - Messenger_save(buf); fd = fopen(path, "w"); - if(fd == NULL) { + if (fd == NULL) { fprintf(stderr, "fopen() failed.\n"); - free(buf); endwin(); exit(1); } - if(fwrite(buf, len, 1, fd) != 1){ + if (fwrite(buf, len, 1, fd) != 1){ fprintf(stderr, "fwrite() failed.\n"); - free(buf); fclose(fd); endwin(); exit(1); } } - free(buf); fclose(fd); } -static void draw_bar() { +static void draw_bar() +{ static int odd = 0; attron(COLOR_PAIR(4)); @@ -265,21 +261,21 @@ static void draw_bar() { attroff(COLOR_PAIR(4) | A_BOLD); int i; - for (i = 0; i < (MAX_WINDOW_SLOTS-1); i++) { + for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) { if (WINDOW_STATUS[i] != -1) { - if (i == w_active) + if (i == active_window) attron(A_BOLD); odd = (odd+1) % 10; - if(windows[i].blink && (odd < 5)) { + if (windows[i].blink && (odd < 5)) { attron(COLOR_PAIR(3)); } printw(" %s", windows[i].title); - if(windows[i].blink && (odd < 5)) { + if (windows[i].blink && (odd < 5)) { attron(COLOR_PAIR(3)); } - if(i == w_active) { + if (i == active_window) { attroff(A_BOLD); } } @@ -287,35 +283,37 @@ static void draw_bar() { refresh(); } -void prepare_window(WINDOW* w) { +void prepare_window(WINDOW *w) +{ mvwin(w, 0, 0); wresize(w, LINES-2, COLS); } /* Shows next window when tab or back-tab is pressed */ -void set_active_window(int ch) { +void set_active_window(int ch) +{ int f_inf = 0; int max = MAX_WINDOW_SLOTS-1; if (ch == '\t') { - int i = (w_active + 1) % max; + int i = (active_window + 1) % max; while (true) { if (WINDOW_STATUS[i] != -1) { - w_active = i; + active_window = i; return; } i = (i + 1) % max; - if (f_inf++ > max) { // infinite loop check + if (f_inf++ > max) { // infinite loop check endwin(); clear(); exit(2); } } }else { - int i = w_active - 1; + int i = active_window - 1; if (i < 0) i = max; while (true) { if (WINDOW_STATUS[i] != -1) { - w_active = i; + active_window = i; return; } if (--i < 0) i = max; @@ -328,26 +326,26 @@ void set_active_window(int ch) { } } -int main(int argc, char* argv[]) { +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; - } - } - } + int i = 0; + 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(); @@ -355,7 +353,7 @@ int main(int argc, char* argv[]) { init_windows(); init_window_status(); - if(f_flag == -1) { + 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"); @@ -363,24 +361,21 @@ int main(int argc, char* argv[]) { } while(true) { - // Update tox. + /* Update tox */ do_tox(); - // Draw. - a = &windows[w_active]; + /* Draw */ + a = &windows[active_window]; prepare_window(a->window); a->blink = false; draw_bar(); a->onDraw(a); - // Handle input. + /* Handle input */ ch = getch(); - if(ch == '\t' || ch == KEY_BTAB) + if (ch == '\t' || ch == KEY_BTAB) set_active_window(ch); - else if(ch != ERR) { - a->onKey(a, ch); - } - else if(ch != ERR) { + else if (ch != ERR) { a->onKey(a, ch); } } -- cgit v1.2.3