1 files changed, 115 insertions, 123 deletions

diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 16750c5d..89c87d8f 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -1,6 +1,6 @@
 /*
- * Toxic -- Tox Curses Client
- */
+* Toxic -- Tox Curses Client
+*/
 
 #include <stdlib.h>
 #include <string.h>
@@ -16,73 +16,78 @@ uint8_t pending_requests[256][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests=0; // XXX
 
 extern void on_friendadded(int friendnumber);
-static void print_usage(ToxWindow* self);
+static void print_usage(ToxWindow *self);
+static char prompt_buf[256] = {0};
+static int prompt_buf_pos = 0;
 
 // XXX:
-int add_req(uint8_t* public_key) {
+int add_req(uint8_t *public_key)
+{
   memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
   ++num_requests;
-
   return num_requests-1;
 }
 
 // XXX: FIX
-unsigned char * hex_string_to_bin(char hex_string[])
+unsigned char *hex_string_to_bin(char hex_string[])
 {
-    size_t len = strlen(hex_string);
-    unsigned char *val = malloc(len);
-    char *pos = hex_string;
-    int i;
-    for(i = 0; i < len; ++i, pos+=2)
-        sscanf(pos,"%2hhx",&val[i]);
-    return val;
+  size_t len = strlen(hex_string);
+  unsigned char *val = malloc(len);
+  char *pos = hex_string;
+  int i;
+  for (i = 0; i < len; ++i, pos+=2)
+    sscanf(pos,"%2hhx",&val[i]);
+  return val;
 }
 
-static char prompt_buf[256] = {0};
-static int prompt_buf_pos=0;
-
-static void execute(ToxWindow* self, char* cmd) {
+static void execute(ToxWindow *self, char *u_cmd)
+{
+  int newlines = 0;
+  char cmd[256] = {0};
+  int i;
+  for (i = 0; i < strlen(prompt_buf); ++i) {
+    if (u_cmd[i] == '\n')
+      ++newlines;
+    else
+      cmd[i - newlines] = u_cmd[i];
+  }
 
-  if(!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
+  if (!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
     endwin();
     exit(0);
   }
-  else if(!strncmp(cmd, "connect ", strlen("connect "))) {
-    char* ip;
-    char* port;
-    char* key;
-    IP_Port dht;
 
-    ip = strchr(cmd, ' ');
-    if(ip == NULL) {
+  else if (!strncmp(cmd, "connect ", strlen("connect "))) {
+    IP_Port dht;
+    char *ip = strchr(cmd, ' ');
+    if (ip == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     ip++;
 
-    port = strchr(ip, ' ');
-    if(port == NULL) {
+    char *port = strchr(ip, ' ');
+    if (port == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     port[0] = 0;
     port++;
 
-    key = strchr(port, ' ');
-    if(key == NULL) {
+    char *key = strchr(port, ' ');
+    if (key == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     key[0] = 0;
     key++;
 
-    if(atoi(port) == 0) {
+    if (atoi(port) == 0) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
     dht.port = htons(atoi(port));
-
     uint32_t resolved_address = resolve_addr(ip);
     if (resolved_address == 0) {
       return;
@@ -93,49 +98,39 @@ static void execute(ToxWindow* self, char* cmd) {
     DHT_bootstrap(dht, binary_string);
     free(binary_string);
   }
-  else if(!strncmp(cmd, "add ", strlen("add "))) {
+
+  else if (!strncmp(cmd, "add ", strlen("add "))) {
     uint8_t id_bin[32];
-    size_t i;
     char xx[3];
     uint32_t x;
-
-    char* id;
-    char* msg;
-    int num;
-
-    id = strchr(cmd, ' ');
-    if(id == NULL) {
+    char *id = strchr(cmd, ' ');
+    if (id == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     id++;
-
-    msg = strchr(id, ' ');
-    if(msg != NULL) {
+    char *msg = strchr(id, ' ');
+    if (msg != NULL) {
       msg[0] = 0;
       msg++;
     }
     else msg = "";
-
-    if(strlen(id) != 2*32) {
+    if (strlen(id) != 2*32) {
       wprintw(self->window, "Invalid ID length.\n");
       return;
     }
-
-    for(i=0; i<32; i++) {
+    int i;
+    for (i = 0; i < 32; ++i) {
       xx[0] = id[2*i];
       xx[1] = id[2*i+1];
       xx[2] = '\0';
-
-      if(sscanf(xx, "%02x", &x) != 1) {
+      if (sscanf(xx, "%02x", &x) != 1) {
         wprintw(self->window, "Invalid ID.\n");
         return;
       }
-
       id_bin[i] = x;
     }
-
-    num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
+    int num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
     switch (num) {
     case -1:
       wprintw(self->window, "Message is too long.\n");
@@ -158,158 +153,157 @@ static void execute(ToxWindow* self, char* cmd) {
       break;
     }
   }
-  else if(!strcmp(cmd, "clear")) { 
-        wclear(self->window);
+
+  else if (!strcmp(cmd, "clear")) {
+    wclear(self->window);
   }
-  else if(!strcmp(cmd, "help")) {
-          print_usage(self);
+
+  else if (!strcmp(cmd, "help")) {
+    wclear(self->window);
+    print_usage(self);
   }
-  else if(!strncmp(cmd, "status ", strlen("status "))) {
-    char* msg;
 
-    msg = strchr(cmd, ' ');
-    if(msg == NULL) {
+  else if (!strncmp(cmd, "status ", strlen("status "))) {
+    char *msg = strchr(cmd, ' ');
+    if (msg == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     msg++;
-
     m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
     wprintw(self->window, "Status set to: %s\n", msg);
   }
-  else if(!strncmp(cmd, "nick ", strlen("nick "))) {
-    char* nick;
 
-    nick = strchr(cmd, ' ');
-    if(nick == NULL) {
+  else if (!strncmp(cmd, "nick ", strlen("nick "))) {
+    char *nick = strchr(cmd, ' ');
+    if (nick == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     nick++;
-
     setname((uint8_t*) nick, strlen(nick)+1);
     wprintw(self->window, "Nickname set to: %s\n", nick);
   }
-  else if(!strcmp(cmd, "myid")) {
+
+  else if (!strcmp(cmd, "myid")) {
     char id[32*2 + 1] = {0};
     size_t i;
-
-    for(i=0; i<32; i++) {
+    for (i = 0; i < 32; ++i) {
       char xx[3];
-      snprintf(xx, sizeof(xx), "%02x",  self_public_key[i] & 0xff);
+      snprintf(xx, sizeof(xx), "%02x", self_public_key[i] & 0xff);
       strcat(id, xx);
     }
-    
     wprintw(self->window, "Your ID: %s\n", id);
   }
-  else if(!strncmp(cmd, "accept ", strlen("accept "))) {
-    char* id;
-    int num;
 
-    id = strchr(cmd, ' ');
-    if(id == NULL) {
+  else if (!strncmp(cmd, "accept ", strlen("accept "))) {
+    char *id = strchr(cmd, ' ');
+    if (id == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     id++;
 
-    num = atoi(id);
-    if(num >= num_requests) {
+    int num = atoi(id);
+    if (num >= num_requests) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
 
     num = m_addfriend_norequest(pending_requests[num]);
-
-    if(num == -1) {
+    if (num == -1)
       wprintw(self->window, "Failed to add friend.\n");
-    }
     else {
       wprintw(self->window, "Friend accepted as: %d.\n", num);
       on_friendadded(num);
     }
   }
-  else if(!strncmp(cmd, "msg ", strlen("msg "))) {
-    char* id;
-    char* msg;
 
-    id = strchr(cmd, ' ');
-
-    if(id == NULL) {
+  else if (!strncmp(cmd, "msg ", strlen("msg "))) {
+    char *id = strchr(cmd, ' ');
+    if (id == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
-    id++;
-
-    msg = strchr(id, ' ');
-    if(msg == NULL) {
+    char *msg = strchr(++id, ' ');
+    if (msg == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
       return;
     }
     msg[0] = 0;
     msg++;
-
-    if(m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0) {
+    if (m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0)
       wprintw(self->window, "Error occurred while sending message.\n");
-    }
-    else {
+    else
       wprintw(self->window, "Message successfully sent.\n");
-    }
   }
-
-  else {
+  else
     wprintw(self->window, "Invalid command.\n");
-  }
 }
 
-static void prompt_onKey(ToxWindow* self, int key) {
-  // PRINTABLE characters: Add to line.
-  if(isprint(key)) {
-    if(prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
-      return;
+static void prompt_onKey(ToxWindow *self, int key)
+{
+  /* Add printable characters to line */
+  if (isprint(key)) {
+    if (prompt_buf_pos == (sizeof(prompt_buf) - 1)) {
+      wprintw(self->window, "\nToo Long.\n");
+      prompt_buf_pos = 0;
+      prompt_buf[0] = 0;
+    }
+    else if (!(prompt_buf_pos == 0) && (prompt_buf_pos < COLS)
+                                 && (prompt_buf_pos % (COLS - 3) == 0)) {
+      prompt_buf[prompt_buf_pos++] = '\n';
+    }
+    else if (!(prompt_buf_pos == 0) && (prompt_buf_pos > COLS)
+                 && ((prompt_buf_pos - (COLS - 3)) % (COLS) == 0)) {
+      prompt_buf[prompt_buf_pos++] = '\n';
     }
     prompt_buf[prompt_buf_pos++] = key;
     prompt_buf[prompt_buf_pos] = 0;
   }
 
-  // RETURN key: execute command.
-  else if(key == '\n') {
+  /* RETURN key: execute command */
+  else if (key == '\n') {
     wprintw(self->window, "\n");
     execute(self, prompt_buf);
     prompt_buf_pos = 0;
     prompt_buf[0] = 0;
   }
 
-  // BACKSPACE key: Remove one character from line.
-  else if(key == 0x107 || key == 0x8 || key == 0x7f) {
-    if(prompt_buf_pos != 0) {
+  /* BACKSPACE key: Remove one character from line */
+  else if (key == 0x107 || key == 0x8 || key == 0x7f) {
+    if (prompt_buf_pos != 0) {
       prompt_buf[--prompt_buf_pos] = 0;
     }
   }
 }
 
-static void prompt_onDraw(ToxWindow* self) {
+static void prompt_onDraw(ToxWindow *self)
+{
   curs_set(1);
   int x, y;
-
   getyx(self->window, y, x);
   (void) x;
+  int i;
+  for (i = 0; i < (strlen(prompt_buf)); ++i) {
+    if ((prompt_buf[i] == '\n') && (y != 0))
+      --y;
+  }
 
   wattron(self->window, COLOR_PAIR(1));
   mvwprintw(self->window, y, 0, "# ");
   wattroff(self->window, COLOR_PAIR(1));
-
   mvwprintw(self->window, y, 2, "%s", prompt_buf);
   wclrtoeol(self->window);
-
   wrefresh(self->window);
 }
 
-static void print_usage(ToxWindow* self) {
+static void print_usage(ToxWindow *self)
+{
   wattron(self->window, COLOR_PAIR(2) | A_BOLD);
   wprintw(self->window, "Commands:\n");
   wattroff(self->window, A_BOLD);
-  
+
   wprintw(self->window, "      connect <ip> <port> <key> : Connect to DHT server\n");
   wprintw(self->window, "      add <id> <message>        : Add friend\n");
   wprintw(self->window, "      status <message>          : Set your status\n");
@@ -318,8 +312,8 @@ static void print_usage(ToxWindow* self) {
   wprintw(self->window, "      myid                      : Print your ID\n");
   wprintw(self->window, "      quit/exit                 : Exit program\n");
   wprintw(self->window, "      help                      : Print this message again\n");
-  wprintw(self->window, "      clear                     : Clear this window\n");
-
+  wprintw(self->window, "      clear                     : Clear this window\n"); 
+  
   wattron(self->window, A_BOLD);
   wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n");
   wattroff(self->window, A_BOLD);
@@ -327,22 +321,20 @@ static void print_usage(ToxWindow* self) {
   wattroff(self->window, COLOR_PAIR(2));
 }
 
-static void prompt_onInit(ToxWindow* self) {
+static void prompt_onInit(ToxWindow *self)
+{
   scrollok(self->window, 1);
-
   print_usage(self);
   wclrtoeol(self->window);
 }
 
-ToxWindow new_prompt() {
+ToxWindow new_prompt()
+{
   ToxWindow ret;
-
   memset(&ret, 0, sizeof(ret));
-
   ret.onKey = &prompt_onKey;
   ret.onDraw = &prompt_onDraw;
   ret.onInit = &prompt_onInit;
   strcpy(ret.title, "[prompt]");
-
   return ret;
 }