Manually merged my earlier commits with upstream

This commit is contained in:
Sean Qureshi 2013-08-07 00:24:37 -07:00
parent d04f2d0e51
commit ea969c6e42
2 changed files with 9 additions and 1 deletions

View File

@ -22,6 +22,7 @@ extern int add_req(uint8_t *public_key); // XXX
/* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS];
#define TOXICVER "0.1.0" //Will be moved to a -D flag later
static ToxWindow windows[MAX_WINDOW_SLOTS];
static ToxWindow* prompt;
@ -257,7 +258,7 @@ static void draw_bar()
move(LINES - 1, 0);
attron(COLOR_PAIR(4) | A_BOLD);
printw(" TOXIC 1.0 |");
printw(" TOXIC " TOXICVER " |");
attroff(COLOR_PAIR(4) | A_BOLD);
int i;

View File

@ -52,6 +52,13 @@ static void execute(ToxWindow *self, char *u_cmd)
cmd[i - newlines] = u_cmd[i];
}
if (cmd[0] == '/') {
int i;
for (i = i1; i < strlen(cmd); i++) { //This doesn't work when it doesn't end with a space and another word
cmd[i - 1] = cmd[i]; //Still working on why
}
}
if (!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
endwin();
exit(0);