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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mannol 2014-07-27 01:50:06 +02:00
commit 4834642b80
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat.c
View File

@ -858,7 +858,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
} }
wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD); wattron(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
wprintw(statusbar->topline, " O"); wprintw(statusbar->topline, " %s", ONLINE_CHAR);
wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD); wattroff(statusbar->topline, COLOR_PAIR(colour) | A_BOLD);
if (friends[self->num].is_typing) if (friends[self->num].is_typing)
@ -871,7 +871,7 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
if (friends[self->num].is_typing) if (friends[self->num].is_typing)
wattroff(statusbar->topline, COLOR_PAIR(YELLOW)); wattroff(statusbar->topline, COLOR_PAIR(YELLOW));
} else { } else {
wprintw(statusbar->topline, " o"); wprintw(statusbar->topline, " %s", OFFLINE_CHAR);
wattron(statusbar->topline, A_BOLD); wattron(statusbar->topline, A_BOLD);
wprintw(statusbar->topline, " %s ", statusbar->nick); wprintw(statusbar->topline, " %s ", statusbar->nick);
wattroff(statusbar->topline, A_BOLD); wattroff(statusbar->topline, A_BOLD);

4
src/friendlist.c
View File

@ -447,7 +447,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
} }
wattron(self->window, COLOR_PAIR(colour) | A_BOLD); wattron(self->window, COLOR_PAIR(colour) | A_BOLD);
wprintw(self->window, "O "); wprintw(self->window, "%s ", ONLINE_CHAR);
wattroff(self->window, COLOR_PAIR(colour) | A_BOLD); wattroff(self->window, COLOR_PAIR(colour) | A_BOLD);
if (f_selected) if (f_selected)
@ -487,7 +487,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m)
wprintw(self->window, "\n"); wprintw(self->window, "\n");
} else { } else {
wprintw(self->window, "o "); wprintw(self->window, "%s ", OFFLINE_CHAR);
if (f_selected) if (f_selected)
wattron(self->window, COLOR_PAIR(BLUE)); wattron(self->window, COLOR_PAIR(BLUE));

2
src/prompt.c
View File

@ -302,7 +302,7 @@ static void prompt_onConnectionChange(ToxWindow *self, Tox *m, int32_t friendnum
char timefrmt[TIME_STR_SIZE]; char timefrmt[TIME_STR_SIZE];
get_time_str(timefrmt, sizeof(timefrmt)); get_time_str(timefrmt, sizeof(timefrmt));
char *msg; const char *msg;
if (status == 1) { if (status == 1) {
msg = "has come online"; msg = "has come online";

3
src/toxic.h
View File

@ -64,6 +64,9 @@
#define T_KEY_C_H 0x08 /* ctrl-h */ #define T_KEY_C_H 0x08 /* ctrl-h */
#define T_KEY_C_Y 0x19 /* ctrl-y */ #define T_KEY_C_Y 0x19 /* ctrl-y */
#define ONLINE_CHAR "*"
#define OFFLINE_CHAR "*"
typedef enum _FATAL_ERRS { typedef enum _FATAL_ERRS {
FATALERR_MEMORY = -1, /* malloc() or calloc() failed */ FATALERR_MEMORY = -1, /* malloc() or calloc() failed */
FATALERR_FREAD = -2, /* fread() failed on critical read */ FATALERR_FREAD = -2, /* fread() failed on critical read */

2
src/toxic_strings.c
View File

@ -112,7 +112,7 @@ int yank_buf(ChatContext *ctx)
if (!ctx->yank[0]) if (!ctx->yank[0])
return -1; return -1;
if (ctx->yank_len + ctx->len >= MAX_STR_SIZE - 1) if (ctx->yank_len + ctx->len >= MAX_STR_SIZE)
return -1; return -1;
wmemmove(&ctx->line[ctx->pos + ctx->yank_len], &ctx->line[ctx->pos], ctx->len - ctx->pos); wmemmove(&ctx->line[ctx->pos + ctx->yank_len], &ctx->line[ctx->pos], ctx->len - ctx->pos);