Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-01 19:36:45 +02:00
Code Issues Projects Releases Wiki Activity

allow line editing via arrow keys in chat/groupchat windows

Browse Source
This commit is contained in:
Jfreegman
2013-11-30 22:12:43 -05:00
parent c25296e65a
commit bb6b28b7c3
5 changed files with 135 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/chat.c
View File

@ -283,13 +283,27 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
/* BACKSPACE key: Remove one character from line */
if (key == 0x107 || key == 0x8 || key == 0x7f) {
if (ctx->pos > 0) {
ctx->line[--ctx->pos] = L'\0';
del_char_from_buf(key, ctx->line, &ctx->pos, &ctx->len);
if (x == 0)
mvwdelch(self->window, y - 1, x2 - 1);
wmove(self->window, y-1, x2-1);
else
mvwdelch(self->window, y, x - 1);
wmove(self->window, y, x-1);
}
} else if (key == KEY_LEFT && ctx->pos > 0) {
--ctx->pos;
if (x == 0)
wmove(self->window, y-1, x2-1);
else
wmove(self->window, y, x-1);
} else if (key == KEY_RIGHT && ctx->line[ctx->pos] != L'\0') {
++ctx->pos;
if (x == x2-1)
wmove(self->window, y+1, 0);
else
wmove(self->window, y, x+1);
} else
/* Add printable chars to buffer and print on input space */
#if HAVE_WIDECHAR
@ -297,11 +311,14 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
#else
if (isprint(key))
#endif
{
if (ctx->pos < (MAX_STR_SIZE-1)) {
mvwaddstr(self->window, y, x, wc_to_char(key));
ctx->line[ctx->pos++] = key;
ctx->line[ctx->pos] = L'\0';
{ /* prevents buffer overflows and strange behaviour when cursor goes past the window */
if ( (ctx->len < MAX_STR_SIZE-1) && (ctx->len < (x2 * (CHATBOX_HEIGHT - 1)-1)) ) {
add_char_to_buf(key, ctx->line, &ctx->pos, &ctx->len);
if (x == x2-1)
wmove(self->window, y+1, 0);
else
wmove(self->window, y, x+1);
}
}
/* RETURN key: Execute command or print line */
@ -354,8 +371,7 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
free(ctx);
free(statusbar);
} else {
ctx->line[0] = L'\0';
ctx->pos = 0;
reset_buf(ctx->line, &ctx->pos, &ctx->len);
}
free(line);
@ -370,6 +386,9 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
ChatContext *ctx = self->chatwin;
wclear(ctx->linewin);
mvwprintw(ctx->linewin, 1, 0, "%s\n", wcs_to_char(ctx->line));
/* Draw status bar */
StatusBar *statusbar = self->stb;
mvwhline(statusbar->topline, 1, 0, ACS_HLINE, x);
@ -434,7 +453,6 @@ static void chat_onDraw(ToxWindow *self, Tox *m)
}
wprintw(statusbar->topline, "\n");
mvwhline(ctx->linewin, 0, 0, ACS_HLINE, x);
wrefresh(self->window);
}