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

a few fixes and update version

Browse Source
This commit is contained in:
Jfreegman 2013-12-04 16:21:32 -05:00
parent 1517cbb6cb
commit e3400e095b
4 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65]) AC_PREREQ([2.65])
AC_INIT([toxic], [0.2.3], [http://tox.im/]) AC_INIT([toxic], [0.2.4], [http://tox.im/])
AC_CONFIG_AUX_DIR(configure_aux) AC_CONFIG_AUX_DIR(configure_aux)
AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

16
src/chat.c
View File

@ -297,15 +297,19 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
} }
else if (key == KEY_HOME) { /* HOME key: Move cursor to beginning of line */ else if (key == KEY_HOME) { /* HOME key: Move cursor to beginning of line */
ctx->pos = 0; if (ctx->pos > 0) {
wmove(self->window, y2 - CURS_Y_OFFSET, 0); ctx->pos = 0;
wmove(self->window, y2 - CURS_Y_OFFSET, 0);
}
} }
else if (key == KEY_END) { /* END key: move cursor to end of line */ else if (key == KEY_END) { /* END key: move cursor to end of line */
ctx->pos = ctx->len; if (ctx->pos != ctx->len) {
int end_y = (ctx->len / x2) + (y2 - CURS_Y_OFFSET); ctx->pos = ctx->len;
int end_x = ctx->len % x2; int end_y = (ctx->len / x2) + (y2 - CURS_Y_OFFSET);
wmove(self->window, end_y, end_x); int end_x = ctx->len % x2;
wmove(self->window, end_y, end_x);
}
} }
else if (key == KEY_LEFT) { else if (key == KEY_LEFT) {

19
src/groupchat.c
View File

@ -235,19 +235,24 @@ static void groupchat_onKey(ToxWindow *self, Tox *m, wint_t key)
} }
else if (key == KEY_DC) { /* DEL key: Remove character at pos */ else if (key == KEY_DC) { /* DEL key: Remove character at pos */
del_char_buf_frnt(ctx->line, &ctx->pos, &ctx->len); if (ctx->pos != ctx->len)
del_char_buf_frnt(ctx->line, &ctx->pos, &ctx->len);
} }
else if (key == KEY_HOME) { /* HOME key: Move cursor to beginning of line */ else if (key == KEY_HOME) { /* HOME key: Move cursor to beginning of line */
ctx->pos = 0; if (ctx->pos > 0) {
wmove(self->window, y2 - CURS_Y_OFFSET, 0); ctx->pos = 0;
wmove(self->window, y2 - CURS_Y_OFFSET, 0);
}
} }
else if (key == KEY_END) { /* END key: move cursor to end of line */ else if (key == KEY_END) { /* END key: move cursor to end of line */
ctx->pos = ctx->len; if (ctx->pos != ctx->len) {
int end_y = (ctx->len / x2) + (y2 - CURS_Y_OFFSET); ctx->pos = ctx->len;
int end_x = ctx->len % x2; int end_y = (ctx->len / x2) + (y2 - CURS_Y_OFFSET);
wmove(self->window, end_y, end_x); int end_x = ctx->len % x2;
wmove(self->window, end_y, end_x);
}
} }
else if (key == KEY_LEFT) { else if (key == KEY_LEFT) {

2
src/prompt.c
View File

@ -266,7 +266,7 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m)
snprintf(statusbar->nick, sizeof(statusbar->nick), "%s", nick); snprintf(statusbar->nick, sizeof(statusbar->nick), "%s", nick);
/* temporary until statusmessage saving works */ /* temporary until statusmessage saving works */
uint8_t *statusmsg = "Toxing on Toxic v.0.2.3"; uint8_t *statusmsg = "Toxing on Toxic v.0.2.4";
m_set_statusmessage(m, statusmsg, strlen(statusmsg) + 1); m_set_statusmessage(m, statusmsg, strlen(statusmsg) + 1);
snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg); snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);