Merge remote-tracking branch 'upstream/master'

1 files changed, 106 insertions, 111 deletions

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; i<MAX_WINDOW_SLOTS; i++) {
-    if(windows[i].onFriendRequest != NULL)
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onFriendRequest != NULL)
       windows[i].onFriendRequest(&windows[i], public_key, data, length);
   }
 }
 
-void on_message(int friendnumber, uint8_t* string, uint16_t length) {
-  size_t i;
-
+void on_message(int friendnumber, uint8_t *string, uint16_t length)
+{
   wprintw(prompt->window, "\n(message) %d: %s\n", friendnumber, string);
-
-  for(i=0; i<MAX_WINDOW_SLOTS; i++) {
-    if(windows[i].onMessage != NULL)
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onMessage != NULL)
       windows[i].onMessage(&windows[i], friendnumber, string, length);
   }
 }
 
-void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) {
-  size_t i;
-
+void on_nickchange(int friendnumber, uint8_t *string, uint16_t length)
+{
   wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
-
-  for(i=0; i<MAX_WINDOW_SLOTS; i++) {
-    if(windows[i].onNickChange != NULL)
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onNickChange != NULL)
       windows[i].onNickChange(&windows[i], friendnumber, string, length);
   }
 }
 
-void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) {
-  size_t i;
-
+void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
+{
   wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
-
-  for(i=0; i<MAX_WINDOW_SLOTS; i++) {
-    if(windows[i].onStatusChange != NULL)
+  int i;
+  for (i=0; i<MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onStatusChange != NULL)
       windows[i].onStatusChange(&windows[i], friendnumber, string, length);
   }
 }
 
-void on_friendadded(int friendnumber) {
+void on_friendadded(int friendnumber)
+{
   friendlist_onFriendAdded(friendnumber);
 }
-// CALLBACKS END
+/* CALLBACKS END */
 
-static void init_term() {
-  // Setup terminal.
+static void init_term()
+{
+  /* Setup terminal */
   initscr();
   cbreak();
   keypad(stdscr, 1);
   noecho();
   timeout(100);
 
-  if(has_colors()) {
+  if (has_colors()) {
     start_color();
     init_pair(1, COLOR_GREEN, COLOR_BLACK);
     init_pair(2, COLOR_CYAN, COLOR_BLACK);
     init_pair(3, COLOR_RED, COLOR_BLACK);
     init_pair(4, COLOR_BLUE, COLOR_BLACK);
   }
-
   refresh();
 }
 
-static void init_tox() {
-  // Init core.
+static void init_tox()
+{
+  /* Init core */
   initMessenger();
 
-  // Callbacks.
+  /* Callbacks */
   m_callback_friendrequest(on_request);
   m_callback_friendmessage(on_message);
   m_callback_namechange(on_nickchange);
   m_callback_userstatus(on_statuschange);
 }
 
-void init_window_status() {
+void init_window_status()
+{
   /* Default window values decrement from -2 */
   int i;
-  for (i = 0; i < N_DEFAULT_WINS; i++)
+  for (i = 0; i < N_DEFAULT_WINS; ++i)
     WINDOW_STATUS[i] = -(i+2);
 
   int j;
@@ -125,15 +127,16 @@ void init_window_status() {
     WINDOW_STATUS[j] = -1;
 }
 
-int add_window(ToxWindow w, int n) {
-  if(w_num >= 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);
     }
   }