Merge remote-tracking branch 'ProjectTox/master'

1 files changed, 95 insertions, 8 deletions

diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 0aad6777..fffc3f84 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -14,6 +14,10 @@
 #include "windows.h"
 
 extern ToxWindow new_prompt();
+extern ToxWindow new_friendlist();
+
+extern int friendlist_onFriendAdded(int num);
+
 extern int add_req(uint8_t* public_key); // XXX
 
 #define TOXWINDOWS_MAX_NUM 32
@@ -25,21 +29,59 @@ 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);
 
-  wprintw(prompt->window, "\nFriend request.\nUse \"accept %d\" to accept it.\n", n);
+  wprintw(prompt->window, "\nFriend request from:\n");
+
+  for(i=0; i<32; i++) {
+    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
+  }
+  wprintw(prompt->window, "\n");
+
+  wprintw(prompt->window, "Use \"accept %d\" to accept it.\n", n);
+
+  for(i=0; i<w_num; 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;
+
   wprintw(prompt->window, "\n(message) %d: %s!\n", friendnumber, string);
+
+  for(i=0; i<w_num; 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) {
-  wprintw(prompt->window, "\n(nick) %d: %s!\n", friendnumber, string);
+  size_t i;
+
+  wprintw(prompt->window, "\n(nickchange) %d: %s!\n", friendnumber, string);
+
+  for(i=0; i<w_num; i++) {
+    if(windows[i].onNickChange != NULL)
+      windows[i].onNickChange(&windows[i], friendnumber, string, length);
+  }
 }
 
 void on_statuschange(int friendnumber, uint8_t* string, uint16_t length) {
-  wprintw(prompt->window, "\n(status) %d: %s!\n", friendnumber, string);
+  size_t i;
+
+  wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string);
+
+  for(i=0; i<w_num; i++) {
+    if(windows[i].onStatusChange != NULL)
+      windows[i].onStatusChange(&windows[i], friendnumber, string, length);
+  }
+}
+
+void on_friendadded(int friendnumber) {
+  friendlist_onFriendAdded(friendnumber);
 }
 // CALLBACKS END
 
@@ -73,7 +115,7 @@ static void init_tox() {
   m_callback_userstatus(on_statuschange);
 }
 
-static int add_window(ToxWindow w) {
+int add_window(ToxWindow w) {
   if(w_num == TOXWINDOWS_MAX_NUM)
     return -1;
 
@@ -88,14 +130,22 @@ static int add_window(ToxWindow w) {
   windows[w_num++] = w;
   w.onInit(&w);
 
-  return w_num;
+  return w_num - 1;
+}
+
+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;
   w_active = 0;
 
-  if(add_window(new_prompt()) == -1) {
+  if(add_window(new_prompt()) == -1 || add_window(new_friendlist()) == -1) {
     fprintf(stderr, "add_window() failed.\n");
 
     endwin();
@@ -134,14 +184,18 @@ static void load_data() {
 
     if(buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
+
       fclose(fd);
+      endwin();
       exit(1);
     }
 
     if(fread(buf, len, 1, fd) != 1){
       fprintf(stderr, "fread() failed.\n");
+
       free(buf);
       fclose(fd);
+      endwin();
       exit(1);
     }
 
@@ -153,6 +207,7 @@ static void load_data() {
 
     if(buf == NULL) {
       fprintf(stderr, "malloc() failed.\n");
+      endwin();
       exit(1);
     }
 
@@ -161,14 +216,18 @@ static void load_data() {
     fd = fopen("data", "w");
     if(fd == NULL) {
       fprintf(stderr, "fopen() failed.\n");
+
       free(buf);
+      endwin();
       exit(1);
     }
 
     if(fwrite(buf, len, 1, fd) != 1){
       fprintf(stderr, "fwrite() failed.\n");
+
       free(buf);
       fclose(fd);
+      endwin();
       exit(1);
     }
   }
@@ -178,6 +237,7 @@ static void load_data() {
 }
 
 static void draw_bar() {
+  static int odd = 0;
   size_t i;
 
   attron(COLOR_PAIR(4));
@@ -186,12 +246,26 @@ static void draw_bar() {
 
   move(LINES - 1, 0);
 
+  attron(COLOR_PAIR(4) | A_BOLD);
+  printw(" TOXIC 1.0 |");
+  attroff(COLOR_PAIR(4) | A_BOLD);
+
   for(i=0; i<w_num; i++) {
     if(i == w_active) {
       attron(A_BOLD);
     }
 
-    printw(" %s ", windows[i].title);
+    odd = (odd+1) % 2;
+
+    if(windows[i].blink && odd) {
+      attron(COLOR_PAIR(3));
+    }
+
+    printw(" %s", windows[i].title);
+
+    if(windows[i].blink && odd) {
+      attron(COLOR_PAIR(3));
+    }
 
     if(i == w_active) {
       attroff(A_BOLD);
@@ -201,6 +275,11 @@ static void draw_bar() {
   refresh();
 }
 
+void prepare_window(WINDOW* w) {
+  mvwin(w, 0, 0);
+  wresize(w, LINES-2, COLS);
+}
+
 int main(int argc, char* argv[]) {
   int ch;
   ToxWindow* a;
@@ -211,14 +290,22 @@ int main(int argc, char* argv[]) {
   init_windows();
 
   while(true) {
+    // Update tox.
     do_tox();
 
+    // Draw.
     a = &windows[w_active];
+    prepare_window(a->window);
+    a->blink = false;
     a->onDraw(a);
     draw_bar();
 
+    // Handle input.
     ch = getch();
-    if(ch != ERR) {
+    if(ch == '\t') {
+      w_active = (w_active + 1) % w_num;
+    }
+    else if(ch != ERR) {
       a->onKey(a, ch);
     }