Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-22 16:43:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests

Browse Source 
Conflicts:
	testing/toxic/prompt.c
This commit is contained in:
irungentoo 2013-08-07 18:20:36 -04:00
commit 8e881ca50f
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chat.c
View File

@ -57,7 +57,6 @@ static void chat_onMessage(ToxWindow *self, int num, uint8_t *msg, uint16_t len)
self->blink = true;
beep();
flash();
}
static void chat_onNickChange(ToxWindow *self, int num, uint8_t *nick, uint16_t len)

3
main.c
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;
@ -258,7 +259,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;

10
prompt.c
View File

@ -62,6 +62,16 @@ static void execute(ToxWindow *self, char *u_cmd)
if (!isspace(cmd[cmd_end]))
break;
cmd[cmd_end + 1] = '\0';
/* What is this supposed to do?
if (cmd[0] == '/') {
wprintw(self->window,"Warning: Run your command without the /, this may not work\n");
int i;
for (i = 1; 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();