added ability to close and reopen chat windows & other minor changes

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<w_num; i++) {
-    if(i == w_active) {
-      attron(A_BOLD);
-    }
+  int i;
+  for (i = 0; i < (MAX_WINDOW_SLOTS-1); i++) {
+    if (WINDOW_STATUS[i] != -1) {
+      if (i == w_active)
+        attron(A_BOLD);
 
-    odd = (odd+1) % 10;
+      odd = (odd+1) % 10;
+      if(windows[i].blink && (odd < 5)) {
+        attron(COLOR_PAIR(3));
+      }
 
-    if(windows[i].blink && (odd < 5)) {
-      attron(COLOR_PAIR(3));
-    }
-
-    printw(" %s", windows[i].title);
-
-    if(windows[i].blink && (odd < 5)) {
-      attron(COLOR_PAIR(3));
-    }
-
-    if(i == w_active) {
-      attroff(A_BOLD);
+      printw(" %s", windows[i].title);
+      if(windows[i].blink && (odd < 5)) {
+        attron(COLOR_PAIR(3));
+      }
+      if(i == w_active) {
+        attroff(A_BOLD);
+      }
     }
   }
-
   refresh();
 }
 
@@ -280,38 +299,66 @@ void prepare_window(WINDOW* w) {
   wresize(w, LINES-2, COLS);
 }
 
+/* Shows next window when tab or back-tab is pressed */
+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;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        w_active = i;
+        return;
+      }
+      i = (i  + 1) % max;
+      if (f_inf++ > 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;
-}
-
+}