Merge official

CMakeLists.txt

@@ -8,8 +8,10 @@ set(exe_name toxic)
 
 add_executable(${exe_name}
 	main.c
+	windows.c
 	prompt.c
 	friendlist.c
+	dhtstatus.c
 	chat.c
 	configdir.c)
 

chat.c

@@ -13,6 +13,8 @@
 #include "../../core/network.h"
 
 #include "windows.h"
+#include "friendlist.h"
+#include "chat.h"
 
 #define CURS_Y_OFFSET 3
 
@@ -24,10 +26,6 @@ typedef struct {
   WINDOW* linewin;
 } ChatContext;
 
-extern int active_window;
-
-extern void del_window(ToxWindow *w, int f_num);
-extern void fix_name(uint8_t *name);
 void print_help(ChatContext *self);
 void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd);
 
@@ -316,11 +314,10 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
       snprintf(xx, sizeof(xx), "%02X",  address[i] & 0xff);
       strcat(id, xx);
     }
-    wprintw(ctx->history, "Your ID: %s\n", id);
+    wprintw(ctx->history, "%s\n", id);
   }
 
   else if (strcmp(ctx->line, "/close") == 0) {
-    active_window = 0;    // Go to prompt screen
     int f_num = ctx->friendnum;
     delwin(ctx->linewin);
     del_window(self, f_num);

chat.h

@@ -0,0 +1,6 @@
+#ifndef CHAT_H_6489PZ13
+#define CHAT_H_6489PZ13
+
+ToxWindow new_chat(Messenger *m, int friendnum);
+
+#endif /* end of include guard: CHAT_H_6489PZ13 */

dhtstatus.c

@@ -0,0 +1,89 @@
+#include "dhtstatus.h"
+#include "string.h"
+#include "../../core/network.h"
+#include "../../core/DHT.h"
+
+typedef uint8_t ipbuf[3*4+3+1];
+static int num_selected = 0;
+
+static void printip(ipbuf buf, IP ip) 
+{
+  sprintf((char*)buf, "%u.%u.%u.%u", ip.c[0], ip.c[1], ip.c[2], ip.c[3]);
+}
+
+static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
+{
+  switch(key) {
+    case KEY_UP:
+    case 'k':
+    if (--num_selected < 0)
+      num_selected = CLIENT_ID_SIZE-1;
+    break;
+    
+    case KEY_DOWN:
+    case 'j':
+    num_selected = (num_selected+1) % CLIENT_ID_SIZE;
+    break;
+    
+    case '\n':
+    break;
+    
+    default:
+    break;
+  }
+}
+
+static void dhtstatus_onDraw(ToxWindow *self)
+{
+  Client_data  * close_clientlist = DHT_get_close_list();
+  curs_set(0);
+  werase(self->window);
+  
+  uint64_t now = unix_time();
+  uint32_t i, j;
+  ipbuf ipbuf;
+  wprintw(self->window,"\n%llu  ______________________ CLOSE LIST ________________________  ___ IP ADDR ___ _PRT_   LST   PNG    ____ SELF ____ _PRT_  LST\n\n", now);
+  for(i = 0; i < CLIENT_ID_SIZE; i++) {
+    Client_data * client = close_clientlist + i;
+    if (i == num_selected) wattron(self->window, COLOR_PAIR(3));
+    wprintw(self->window,"[%02i]  ", i);
+    uint16_t port = ntohs(client->ip_port.port);
+    if(port) {
+      for(j = 0; j < 32; j++)
+        wprintw(self->window, "%02hhx", client->client_id[j]);
+          
+      printip(ipbuf, client->ip_port.ip);
+      wprintw(self->window, "  %15s %5u ", ipbuf, port);
+      wprintw(self->window, "  %3llu ", now - client->timestamp);
+      wprintw(self->window, "  %3llu ", now - client->last_pinged);
+      
+      port = ntohs(client->ret_ip_port.port);
+      if(port) {
+        printip(ipbuf, client->ret_ip_port.ip);
+        wprintw(self->window, "  %15s %5u  %3llu", ipbuf, port, now - close_clientlist[i].ret_timestamp);
+      }
+    }
+    wprintw(self->window, "\n"); 
+    if (i == num_selected) wattroff(self->window, COLOR_PAIR(3)); 
+  }
+  
+  wrefresh(self->window);
+}
+
+static void dhtstatus_onInit(ToxWindow *self, Messenger *m)
+{
+
+}
+  
+ToxWindow new_dhtstatus() 
+{
+	ToxWindow ret;
+	memset(&ret, 0, sizeof(ret));
+
+	ret.onKey          = &dhtstatus_onKey;
+	ret.onDraw         = &dhtstatus_onDraw;
+	ret.onInit         = &dhtstatus_onInit;
+
+	strcpy(ret.title, "[dht status]");
+	return ret;
+}

dhtstatus.h

@@ -0,0 +1,8 @@
+#ifndef _dhtstatus_h
+#define _dhtstatus_h
+
+#include "windows.h"
+
+ToxWindow new_dhtstatus();
+
+#endif

friendlist.c

@@ -11,12 +11,9 @@
 #include "../../core/network.h"
 
 #include "windows.h"
+#include "friendlist.h"
 
-extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM];
+static char * WINDOW_STATUS;
-extern int add_window(ToxWindow w, int n);
-extern ToxWindow new_chat(Messenger *m, int friendnum);
-
-extern int active_window;
 
 typedef struct {
   uint8_t name[MAX_NAME_LENGTH];
@@ -54,8 +51,7 @@ void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str,
     for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
       if (WINDOW_STATUS[i] == -1) {
         WINDOW_STATUS[i] = num;
-        add_window(new_chat(m, num), i);
+        add_window(m, new_chat(m, num), i);
-        active_window = i;
         break;
       }
     }
@@ -111,7 +107,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
       int i;
       for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
         if (WINDOW_STATUS[i] == num_selected) {
-          active_window = i;
+          set_active_window(i);
           break;
         }
       }
@@ -121,8 +117,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
         if (WINDOW_STATUS[i] == -1) {
           WINDOW_STATUS[i] = num_selected;
           friends[num_selected].chatwin = num_selected;
-          add_window(new_chat(m, num_selected), i);
+          add_window(m, new_chat(m, num_selected), i);
-          active_window = i;
           break;
         }
       }
@@ -169,7 +164,8 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
 
 }
 
-ToxWindow new_friendlist() {
+ToxWindow new_friendlist(char * ws) {
+  WINDOW_STATUS = ws;
   ToxWindow ret;
   memset(&ret, 0, sizeof(ret));
 

friendlist.h

@@ -0,0 +1,12 @@
+#ifndef FRIENDLIST_H_53I41IM
+#define FRIENDLIST_H_53I41IM
+
+#include "windows.h"
+#include "chat.h"
+
+ToxWindow new_friendlist(char * ws);
+int friendlist_onFriendAdded(Messenger *m, int num);
+void disable_chatwin(int f_num);
+void fix_name(uint8_t *name);
+
+#endif /* end of include guard: FRIENDLIST_H_53I41IM */

main.c

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <signal.h>
 
 #ifdef _win32
 #include <direct.h>
@@ -21,104 +22,21 @@
 
 #include "configdir.h"
 #include "windows.h"
+#include "prompt.h"
+#include "friendlist.h"
 
-extern ToxWindow new_prompt();
-extern ToxWindow new_friendlist();
 
-extern int friendlist_onFriendAdded(Messenger *m, int num);
+void on_window_resize(int sig) 
-extern void disable_chatwin(int f_num);
-extern int add_req(uint8_t *public_key); // XXX
-extern unsigned char *hex_string_to_bin(char hex_string[]);
-
-static int store_data(char*);
-
-/* Holds status of chat windows */
-char WINDOW_STATUS[MAX_WINDOW_SLOTS];
-
-#ifndef TOXICVER
-#define TOXICVER "NOVER" //Use the -D flag to set this
-#endif
-
-static ToxWindow windows[MAX_WINDOW_SLOTS];
-static ToxWindow* prompt;
-
-static Messenger *m;
-static char *DATA_FILE;
-
-int w_num;
-int active_window;
-
-/* CALLBACKS START */
-void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
 {
-  int n = add_req(public_key);
+    endwin();
-  wprintw(prompt->window, "\nFriend request from:\n");
+    refresh();
-
+    clear();
-  int i;
-  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
-    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
-  }
-
-  wprintw(prompt->window, "\nWith the message: %s\n", data);
-  wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
-
-  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onMessage != NULL)
-      windows[i].onMessage(&windows[i], m, friendnumber, string, length);
-  }
-}
-
-void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  int i;
-  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
-    if (windows[i].onAction != NULL)
-      windows[i].onAction(&windows[i], m, friendnumber, string, length);
-  }
-}
-
-void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
-  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
-{
-  wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
-  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)
-{
-    friendlist_onFriendAdded(m, friendnumber);
-    int st;
-    if ((st = store_data(DATA_FILE)) != 0) {
-        wprintw(prompt->window, "\nCould not store messenger, error code: %d\n", st);
-    }
-}
-/* CALLBACKS END */
-
 static void init_term()
 {
   /* Setup terminal */
+  signal(SIGWINCH, on_window_resize);
   initscr();
   cbreak();
   keypad(stdscr, 1);
@@ -136,10 +54,10 @@ static void init_term()
   refresh();
 }
 
-static void init_tox()
+static Messenger *init_tox()
 {
   /* Init core */
-  m = initMessenger();
+  Messenger *m = initMessenger();
 
   /* Callbacks */
   m_callback_friendrequest(m, on_request, NULL);
@@ -154,6 +72,7 @@ static void init_tox()
 #else
   setname(m, (uint8_t*) "Hipster", sizeof("Hipster"));
 #endif
+  return m;
 }
 
 #define MAXLINE 90    /* Approx max number of chars in a sever line (IP + port + key) */
@@ -202,67 +121,7 @@ int init_connection(void)
   return 0;
 }
 
-void init_window_status()
+static void do_tox(Messenger *m, ToxWindow * prompt)
-{
-  /* Default window values decrement from -2 */
-  int i;
-  for (i = 0; i < N_DEFAULT_WINS; ++i)
-    WINDOW_STATUS[i] = -(i+2);
-
-  int j;
-  for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
-    WINDOW_STATUS[j] = -1;
-}
-
-int add_window(ToxWindow w, int n)
-{
-  if (w_num >= TOXWINDOWS_MAX_NUM)
-    return -1;
-
-  if (LINES < 2)
-    return -1;
-
-  w.window = newwin(LINES - 2, COLS, 0, 0);
-  if (w.window == NULL)
-    return -1;
-
-  windows[n] = w;
-  w.onInit(&w, m);
-  w_num++;
-  return n;
-}
-
-/* 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();
-}
-
-static void init_windows()
-{
-  w_num = 0;
-  int n_prompt = 0;
-  int n_friendslist = 1;
-  if (add_window(new_prompt(), n_prompt) == -1
-                        || add_window(new_friendlist(), n_friendslist) == -1) {
-    fprintf(stderr, "add_window() failed.\n");
-    endwin();
-    exit(1);
-  }
-  prompt = &windows[n_prompt];
-}
-
-static void do_tox()
 {
   static int conn_try = 0;
   static int conn_err = 0;
@@ -286,190 +145,69 @@ static void do_tox()
   doMessenger(m);
 }
 
-static void populate_friends()
+static void load_data(Messenger *m, char *path)
 {
-    wprintw(prompt->window, "Populating friends...\n");
+  FILE *fd;
-    uint32_t i;
+  size_t len;
-    for (i = 0; i < m->numfriends; i++) {
+  uint8_t *buf;
-        wprintw(prompt->window, "Added friend %d\n", i);
+
-        friendlist_onFriendAdded(m, i);
+  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) {
+      fprintf(stderr, "malloc() failed.\n");
+      fclose(fd);
+      endwin();
+      exit(1);
     }
-}
+    if (fread(buf, len, 1, fd) != 1){
-
+      fprintf(stderr, "fread() failed.\n");
-/*
+      free(buf);
- * Store Messenger data to path
+      fclose(fd);
- * Return 0 Messenger stored successfully
+      endwin();
- * Return 1 malloc failed
+      exit(1);
- * Return 2 fopen failed
+    }
- * Return 3 fwrite failed
+    Messenger_load(m, buf, len);
- */
+  }
-static int store_data(char *path)
+  else {
-{
-    FILE *fd;
-    size_t len;
-    uint8_t *buf;
-
     len = Messenger_size(m);
     buf = malloc(len);
     if (buf == NULL) {
-        return 1;
+      fprintf(stderr, "malloc() failed.\n");
+      endwin();
+      exit(1);
     }
     Messenger_save(m, buf);
 
     fd = fopen(path, "w");
     if (fd == NULL) {
-        free(buf);
+      fprintf(stderr, "fopen() failed.\n");
-        return 2;
+      free(buf);
+      endwin();
+      exit(1);
     }
 
-    if (fwrite(buf, len, 1, fd) != 1) {
+    if (fwrite(buf, len, 1, fd) != 1){
-        free(buf);
+      fprintf(stderr, "fwrite() failed.\n");
-        fclose(fd);
+      free(buf);
-        return 3;
+      fclose(fd);
-    }
+      endwin();
-
+      exit(1);
-    free(buf);
-    fclose(fd);
-
-    wprintw(prompt->window, "Messenger stored\n");
-
-    return 0;
-}
-
-static void load_data(char *path) {
-    FILE *fd;
-    size_t len;
-    uint8_t *buf;
-
-    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) {
-            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);
-        }
-        if (Messenger_load(m, buf, len) != 0) {
-            fprintf(stderr, "Problem while loading messenger");
-        }
-        free(buf);
-        fclose(fd);
-    } else {
-        int st;
-        if ((st = store_data(path)) != 0) {
-            fprintf(stderr, "storing messenger failed with error code: %d", st);
-            endwin();
-            exit(1);
-        }
-    }
-}
-
-static void draw_bar()
-{
-  static int odd = 0;
-  int blinkrate = 30;
-
-  attron(COLOR_PAIR(4));
-  mvhline(LINES - 2, 0, '_', COLS);
-  attroff(COLOR_PAIR(4));
-
-  move(LINES - 1, 0);
-
-  attron(COLOR_PAIR(4) | A_BOLD);
-  printw(" TOXIC " TOXICVER "|");
-  attroff(COLOR_PAIR(4) | A_BOLD);
-
-  int i;
-  for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
-    if (WINDOW_STATUS[i] != -1) {
-      if (i == active_window)
-        attron(A_BOLD);
-
-      odd = (odd+1) % blinkrate;
-      if (windows[i].blink && (odd < (blinkrate/2)))
-        attron(COLOR_PAIR(3));
-
-      printw(" %s", windows[i].title);
-      if (windows[i].blink && (odd < (blinkrate/2)))
-        attroff(COLOR_PAIR(3));
-
-      if (i == active_window) {
-        attroff(A_BOLD);
-      }
-    }
-  }
-  refresh();
-}
-
-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)
-{
-  int f_inf = 0;
-  int max = MAX_WINDOW_SLOTS-1;
-  if (ch == '\t') {
-    int i = (active_window + 1) % max;
-    while (true) {
-      if (WINDOW_STATUS[i] != -1) {
-        active_window = i;
-        return;
-      }
-      i = (i  + 1) % max;
-      if (f_inf++ > max) {    // infinite loop check
-        endwin();
-        exit(2);
-      }
-    }
-  }else {
-    int i = active_window - 1;
-    if (i < 0) i = max;
-    while (true) {
-      if (WINDOW_STATUS[i] != -1) {
-        active_window = i;
-        return;
-      }
-      if (--i < 0) i = max;
-      if (f_inf++ > max) {
-        endwin();
-        exit(2);
-      }
     }
   }
+  free(buf);
+  fclose(fd);
 }
 
 int main(int argc, char *argv[])
 {
-  int ch;
-  ToxWindow* a;
   char *user_config_dir = get_user_config_dir();
-  int config_err = create_user_config_dir(user_config_dir);
+  char *DATA_FILE = NULL;
-  if(config_err) {
+  int config_err = 0;
-    DATA_FILE = "data";
-  } else {
-    DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
-    strcpy(DATA_FILE, user_config_dir);
-    strcat(DATA_FILE, CONFIGDIR);
-    strcat(DATA_FILE, "data");
-  }
-  free(user_config_dir);
 
-  /* This is broken */
   int f_loadfromfile = 1;
   int f_flag = 0;
   int i = 0;
@@ -479,7 +217,7 @@ int main(int argc, char *argv[])
     else if (argv[i][0] == '-') {
       if (argv[i][1] == 'f') {
         if (argv[i + 1] != NULL)
-          DATA_FILE = argv[i + 1];
+          DATA_FILE = strdup(argv[i + 1]);
         else
           f_flag = -1;
       } else if (argv[i][1] == 'n') {
@@ -488,15 +226,27 @@ int main(int argc, char *argv[])
     }
   }
 
+  if (DATA_FILE == NULL ) {
+    config_err = create_user_config_dir(user_config_dir);
+    if (config_err) {
+      DATA_FILE = strdup("data");
+    } else {
+      DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
+      strcpy(DATA_FILE, user_config_dir);
+      strcat(DATA_FILE, CONFIGDIR);
+      strcat(DATA_FILE, "data");
+    }
+  }
+  free(user_config_dir);
+
   init_term();
-  init_tox();
+  Messenger *m = init_tox();
-  init_windows();
+  ToxWindow *prompt = init_windows(m);
   init_window_status();
 
-  if(f_loadfromfile) {
+  if(f_loadfromfile)
-      load_data(DATA_FILE);
+    load_data(m, DATA_FILE);
-      populate_friends();
+  free(DATA_FILE);
-  }
 
   if (f_flag == -1) {
     attron(COLOR_PAIR(3) | A_BOLD);
@@ -513,25 +263,11 @@ int main(int argc, char *argv[])
   }
   while(true) {
     /* Update tox */
-    do_tox();
+    do_tox(m, prompt);
 
     /* Draw */
-    a = &windows[active_window];
+    draw_active_window(m);
-    prepare_window(a->window);
-    a->blink = false;
-    draw_bar();
-    a->onDraw(a);
-
-    /* Handle input */
-    ch = getch();
-    if (ch == '\t' || ch == KEY_BTAB)
-      set_active_window(ch);
-    else if (ch != ERR)
-      a->onKey(a, m, ch);
   }
-
   cleanupMessenger(m);
-  free(DATA_FILE);
-
   return 0;
 }

prompt.c

@@ -11,11 +11,12 @@
 #include "../../core/network.h"
 
 #include "windows.h"
+#include "prompt.h"
 
 uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
 
-extern void on_friendadded(int friendnumber);
+static friendAddedFn *on_friendadded;
 static char prompt_buf[MAX_STR_SIZE] = {0};
 static int prompt_buf_pos = 0;
 
@@ -87,7 +88,7 @@ void cmd_accept(ToxWindow *self, Messenger *m, char **args)
     wprintw(self->window, "Failed to add friend.\n");
   else {
     wprintw(self->window, "Friend accepted as: %d.\n", num);
-    on_friendadded(num);
+    on_friendadded(m, num);
   }
 }
 
@@ -121,6 +122,11 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
     }
     id_bin[i] = x;
   }
+  
+  for (i = 0; i < FRIEND_ADDRESS_SIZE; i++) {
+    id[i] = toupper(id[i]);
+  }
+  
   int num = m_addfriend(m, id_bin, (uint8_t*) msg, strlen(msg)+1);
   switch (num) {
   case FAERR_TOOLONG:
@@ -138,9 +144,15 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
   case FAERR_UNKNOWN:
     wprintw(self->window, "Undefined error when adding friend.\n");
     break;
+  case FAERR_BADCHECKSUM:
+    wprintw(self->window, "Bad checksum in address.\n");
+    break;
+  case FAERR_SETNEWNOSPAM:
+    wprintw(self->window, "Nospam was different.\n");
+    break;
   default:
     wprintw(self->window, "Friend added as %d.\n", num);
-    on_friendadded(num);
+    on_friendadded(m, num);
     break;
   }
 }
@@ -226,7 +238,7 @@ void cmd_myid(ToxWindow *self, Messenger *m, char **args)
     snprintf(xx, sizeof(xx), "%02X", address[i] & 0xff);
     strcat(id, xx);
   }
-  wprintw(self->window, "Your ID: %s\n", id);
+  wprintw(self->window, "%s\n", id);
 }
 
 void cmd_nick(ToxWindow *self, Messenger *m, char **args)
@@ -422,8 +434,9 @@ static void prompt_onInit(ToxWindow *self, Messenger *m)
   wclrtoeol(self->window);
 }
 
-ToxWindow new_prompt()
+ToxWindow new_prompt(friendAddedFn *f)
 {
+  on_friendadded = f; 
   ToxWindow ret;
   memset(&ret, 0, sizeof(ret));
   ret.onKey = &prompt_onKey;

prompt.h

@@ -0,0 +1,14 @@
+#ifndef PROMPT_H_UZYGWFFL
+#define PROMPT_H_UZYGWFFL
+
+#include "windows.h"
+
+typedef void (friendAddedFn)(Messenger *m, int friendnumber);
+
+ToxWindow new_prompt(friendAddedFn *f);
+int add_req(uint8_t *public_key);
+unsigned char *hex_string_to_bin(char hex_string[]);
+
+#endif /* end of include guard: PROMPT_H_UZYGWFFL */
+
+

windows.c

@@ -0,0 +1,239 @@
+#include "friendlist.h"
+#include "prompt.h"
+#include "dhtstatus.h"
+#include "windows.h"
+
+/* Holds status of chat windows */
+char WINDOW_STATUS[MAX_WINDOW_SLOTS];
+
+static int w_num;
+static ToxWindow windows[MAX_WINDOW_SLOTS];
+static Messenger *m;
+int active_window;
+
+static ToxWindow* prompt;
+
+/* CALLBACKS START */
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata)
+{
+  int n = add_req(public_key);
+  wprintw(prompt->window, "\nFriend request from:\n");
+
+  int i;
+  for (i = 0; i < KEY_SIZE_BYTES; ++i) {
+    wprintw(prompt->window, "%02x", public_key[i] & 0xff);
+  }
+
+  wprintw(prompt->window, "\nWith the message: %s\n", data);
+  wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
+
+  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onMessage != NULL)
+      windows[i].onMessage(&windows[i], m, friendnumber, string, length);
+  }
+}
+
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  int i;
+  for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    if (windows[i].onAction != NULL)
+      windows[i].onAction(&windows[i], m, friendnumber, string, length);
+  }
+}
+
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
+  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(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata)
+{
+  wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
+  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(Messenger *m, int friendnumber)
+{
+  friendlist_onFriendAdded(m, friendnumber);
+}
+/* CALLBACKS END */
+
+int add_window(Messenger *m, ToxWindow w, int n)
+{
+  if (w_num >= TOXWINDOWS_MAX_NUM)
+    return -1;
+
+  if (LINES < 2)
+    return -1;
+
+  w.window = newwin(LINES - 2, COLS, 0, 0);
+  if (w.window == NULL)
+    return -1;
+
+  windows[n] = w;
+  w.onInit(&w, m);
+  w_num++;
+  active_window = n;
+  return n;
+}
+
+/* Deletes window w and cleans up */
+void del_window(ToxWindow *w, int f_num)
+{
+  active_window = 0; // Go to prompt screen
+  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();
+}
+
+/* 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 = (active_window + 1) % max;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        active_window = i;
+        return;
+      }
+      i = (i  + 1) % max;
+      if (f_inf++ > max) {    // infinite loop check
+        endwin();
+        exit(2);
+      }
+    }
+  }else {
+    int i = active_window - 1;
+    if (i < 0) i = max;
+    while (true) {
+      if (WINDOW_STATUS[i] != -1) {
+        active_window = i;
+        return;
+      }
+      if (--i < 0) i = max;
+      if (f_inf++ > max) {
+        endwin();
+        exit(2);
+      }
+    }
+  }
+}
+
+void init_window_status()
+{
+  /* Default window values decrement from -2 */
+  int i;
+  for (i = 0; i < N_DEFAULT_WINS; ++i)
+    WINDOW_STATUS[i] = -(i+2);
+
+  int j;
+  for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
+    WINDOW_STATUS[j] = -1;
+}
+
+ToxWindow *init_windows()
+{
+  w_num = 0;
+  int n_prompt = 0;
+  int n_friendslist = 1;
+  int n_dhtstatus = 2;
+  if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
+                        || add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1
+                        || add_window(m, new_dhtstatus(), n_dhtstatus) == -1) {
+    fprintf(stderr, "add_window() failed.\n");
+    endwin();
+    exit(1);
+  }
+  active_window = n_prompt;
+  prompt = &windows[n_prompt];
+  return prompt;
+}
+
+static void draw_bar()
+{
+  static int odd = 0;
+  int blinkrate = 30;
+
+  attron(COLOR_PAIR(4));
+  mvhline(LINES - 2, 0, '_', COLS);
+  attroff(COLOR_PAIR(4));
+
+  move(LINES - 1, 0);
+
+  attron(COLOR_PAIR(4) | A_BOLD);
+  printw(" TOXIC " TOXICVER "|");
+  attroff(COLOR_PAIR(4) | A_BOLD);
+
+  int i;
+  for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
+    if (WINDOW_STATUS[i] != -1) {
+      if (i == active_window)
+        attron(A_BOLD);
+
+      odd = (odd+1) % blinkrate;
+      if (windows[i].blink && (odd < (blinkrate/2)))
+        attron(COLOR_PAIR(3));
+
+      printw(" %s", windows[i].title);
+      if (windows[i].blink && (odd < (blinkrate/2)))
+        attroff(COLOR_PAIR(3));
+
+      if (i == active_window) {
+        attroff(A_BOLD);
+      }
+    }
+  }
+  refresh();
+}
+
+void prepare_window(WINDOW *w)
+{
+  mvwin(w, 0, 0);
+  wresize(w, LINES-2, COLS);
+}
+
+void draw_active_window(Messenger *m)
+{
+
+  ToxWindow *a = &windows[active_window];
+  prepare_window(a->window);
+  a->blink = false;
+  draw_bar();
+  a->onDraw(a);
+
+  /* Handle input */
+  int ch = getch();
+  if (ch == '\t' || ch == KEY_BTAB)
+    set_active_window(ch);
+  else if (ch != ERR)
+    a->onKey(a, m, ch);
+}

windows.h

@@ -1,19 +1,28 @@
 /*
  * Toxic -- Tox Curses Client
  */
+#ifndef _windows_h
+#define _windows_h
 
+#include <curses.h>
+#include <stdint.h>
 #include <stdbool.h>
+#include "../../core/Messenger.h"
 #define TOXWINDOWS_MAX_NUM 32
 #define MAX_FRIENDS_NUM 100
 #define MAX_STR_SIZE 256
 #define KEY_SIZE_BYTES 32
 
 /* number of permanent default windows */
-#define N_DEFAULT_WINS 2
+#define N_DEFAULT_WINS 3
 
 /* maximum window slots for WINDOW_STATUS array */
 #define MAX_WINDOW_SLOTS N_DEFAULT_WINS+MAX_FRIENDS_NUM
 
+#ifndef TOXICVER
+#define TOXICVER "NOVER" //Use the -D flag to set this
+#endif
+
 typedef struct ToxWindow_ ToxWindow;
 
 struct ToxWindow_ {
@@ -32,3 +41,17 @@ struct ToxWindow_ {
 
   WINDOW* window;
 };
+
+void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void* userdata);
+void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void* userdata);
+void init_window_status();
+ToxWindow * init_windows();
+void draw_active_window(Messenger * m);
+int add_window(Messenger *m, ToxWindow w, int n);
+void del_window(ToxWindow *w, int f_num);
+void set_active_window(int ch);
+#endif
+