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

small fix and don't show typing alert for /commands

Browse Source
This commit is contained in:
Jfreegman 2014-02-23 05:38:44 -05:00
parent 5b9d3f6f62
commit b018aa384e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/chat.c
View File

@ -312,6 +312,7 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
getyx(self->window, y, x); getyx(self->window, y, x);
getmaxyx(self->window, y2, x2); getmaxyx(self->window, y2, x2);
int cur_len = 0; int cur_len = 0;
bool close_win = false;
if (key == 0x107 || key == 0x8 || key == 0x7f) { /* BACKSPACE key: Remove character behind pos */ if (key == 0x107 || key == 0x8 || key == 0x7f) { /* BACKSPACE key: Remove character behind pos */
if (ctx->pos > 0) { if (ctx->pos > 0) {
@ -440,7 +441,7 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
wmove(self->window, y, x + MAX(1, wcwidth(key))); wmove(self->window, y, x + MAX(1, wcwidth(key)));
} }
if (!ctx->self_is_typing) if (!ctx->self_is_typing && ctx->line[0] != '/')
set_typingstatus(self, m, true); set_typingstatus(self, m, true);
} }
/* RETURN key: Execute command or print line */ /* RETURN key: Execute command or print line */
@ -453,7 +454,6 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
wclear(ctx->linewin); wclear(ctx->linewin);
wmove(self->window, y2 - CURS_Y_OFFSET, 0); wmove(self->window, y2 - CURS_Y_OFFSET, 0);
wclrtobot(self->window); wclrtobot(self->window);
bool close_win = false;
if (!string_is_empty(line)) if (!string_is_empty(line))
add_line_to_hist(ctx->line, ctx->len, ctx->ln_history, &ctx->hst_tot, &ctx->hst_pos); add_line_to_hist(ctx->line, ctx->len, ctx->ln_history, &ctx->hst_tot, &ctx->hst_pos);
@ -497,11 +497,13 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
free(statusbar); free(statusbar);
} else { } else {
reset_buf(ctx->line, &ctx->pos, &ctx->len); reset_buf(ctx->line, &ctx->pos, &ctx->len);
if (ctx->len <= 0 && ctx->self_is_typing)
set_typingstatus(self, m, false);
} }
} }
if (!close_win) {
if (ctx->len <= 0 && ctx->self_is_typing)
set_typingstatus(self, m, false);
}
} }
static void chat_onDraw(ToxWindow *self, Tox *m) static void chat_onDraw(ToxWindow *self, Tox *m)