Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core into auto_tests

2 files changed, 67 insertions, 8 deletions

diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 1ba8b6c9..8de76244 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -249,6 +249,7 @@ static void load_data(char *path)
 static void draw_bar()
 {
   static int odd = 0;
+  int blinkrate = 30;
 
   attron(COLOR_PAIR(4));
   mvhline(LINES - 2, 0, '_', COLS);
@@ -266,14 +267,13 @@ static void draw_bar()
       if (i == active_window)
         attron(A_BOLD);
 
-      odd = (odd+1) % 10;
-      if (windows[i].blink && (odd < 5)) {
+      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 < 5)) {
-        attron(COLOR_PAIR(3));
+      if (windows[i].blink && (odd < (blinkrate/2))) {
+        attroff(COLOR_PAIR(3));
       }
       if (i == active_window) {
         attroff(A_BOLD);
@@ -375,9 +375,8 @@ int main(int argc, char *argv[])
     ch = getch();
     if (ch == '\t' || ch == KEY_BTAB)
       set_active_window(ch);
-    else if (ch != ERR) {
+    else if (ch != ERR)
       a->onKey(a, ch);
-    }
   }
   return 0;
 }
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 89c87d8f..d79d061f 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -52,6 +52,17 @@ static void execute(ToxWindow *self, char *u_cmd)
       cmd[i - newlines] = u_cmd[i];
   }
 
+  int leading_spc = 0;
+  for (i = 0; i < 256 && isspace(cmd[i]); ++i)
+    leading_spc++;
+  memmove(cmd, cmd + leading_spc, 256 - leading_spc);
+
+  int cmd_end = strlen(cmd);
+  while (cmd_end > 0 && cmd_end--)
+    if (!isspace(cmd[cmd_end]))
+      break;
+  cmd[cmd_end + 1] = '\0';
+
   if (!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
     endwin();
     exit(0);
@@ -164,6 +175,54 @@ static void execute(ToxWindow *self, char *u_cmd)
   }
 
   else if (!strncmp(cmd, "status ", strlen("status "))) {
+    char *status = strchr(cmd, ' ');
+    char *msg;
+    char *status_text;
+    if (status == NULL) {
+      wprintw(self->window, "Invalid syntax.\n");
+      return;
+    }
+    status++;
+    USERSTATUS_KIND status_kind;
+    if (!strncmp(status, "online", strlen("online"))) {
+      status_kind = USERSTATUS_KIND_ONLINE;
+      status_text = "ONLINE";
+    }
+
+    else if (!strncmp(status, "away", strlen("away"))) {
+      status_kind = USERSTATUS_KIND_AWAY;
+      status_text = "AWAY";
+    }
+
+    else if (!strncmp(status, "busy", strlen("busy"))) {
+      status_kind = USERSTATUS_KIND_BUSY;
+      status_text = "BUSY";
+    }
+
+    else if (!strncmp(status, "offline", strlen("offline"))) {
+      status_kind = USERSTATUS_KIND_OFFLINE;
+      status_text = "OFFLINE";
+    }
+
+    else
+    {
+      wprintw(self->window, "Invalid status.\n");
+      return;
+    }
+
+    msg = strchr(status, ' ');
+    if (msg == NULL) {
+      m_set_userstatus_kind(status_kind);
+      wprintw(self->window, "Status set to: %s\n", status_text);
+    }
+    else {
+      msg++;
+      m_set_userstatus(status_kind, (uint8_t*) msg, strlen(msg)+1);
+      wprintw(self->window, "Status set to: %s, %s\n", status_text, msg);
+    }
+  }
+
+  else if (!strncmp(cmd, "statusmsg ", strlen("statumsg "))) {
     char *msg = strchr(cmd, ' ');
     if (msg == NULL) {
       wprintw(self->window, "Invalid syntax.\n");
@@ -306,7 +365,8 @@ static void print_usage(ToxWindow *self)
 
   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");
+  wprintw(self->window, "      status <type> <message>   : Set your status\n");
+  wprintw(self->window, "      statusmsg  <message>      : Set your status\n");
   wprintw(self->window, "      nick <nickname>           : Set your nickname\n");
   wprintw(self->window, "      accept <number>           : Accept friend request\n");
   wprintw(self->window, "      myid                      : Print your ID\n");