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

prevent screen from moving on input when in scroll mode

Browse Source
This commit is contained in:
Jfreegman 2014-03-28 17:33:23 -04:00
parent 21c48bde5c
commit 26640cda14
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/line_info.c
View File

@ -143,7 +143,6 @@ void line_info_add(ToxWindow *self, uint8_t *tmstmp, uint8_t *name1, uint8_t *na
/* If chat history exceeds limit move root forward and free old root */ /* If chat history exceeds limit move root forward and free old root */
if (++hst->line_items > MAX_HISTORY) { if (++hst->line_items > MAX_HISTORY) {
--hst->line_items;
struct line_info *tmp = hst->line_root->next; struct line_info *tmp = hst->line_root->next;
tmp->prev = NULL; tmp->prev = NULL;
@ -181,9 +180,11 @@ void line_info_add(ToxWindow *self, uint8_t *tmstmp, uint8_t *name1, uint8_t *na
/* move line_start forward proportionate to the number of new lines */ /* move line_start forward proportionate to the number of new lines */
if (y + hst->queue_lns - hst->queue >= max_y) { if (y + hst->queue_lns - hst->queue >= max_y) {
while (lines > 0 && hst->line_start->next) { while (lines > 0 && hst->line_start->next) {
lines -= (1 + hst->line_start->len / (x2 - offst));
hst->line_start = hst->line_start->next;
++hst->start_id; ++hst->start_id;
lines -= (1 + hst->line_start->len / (x2 - offst));
if (!hst->scroll_mode)
hst->line_start = hst->line_start->next;
} }
} }
} }
@ -193,6 +194,9 @@ void line_info_print(ToxWindow *self)
ChatContext *ctx = self->chatwin; ChatContext *ctx = self->chatwin;
WINDOW *win = ctx->history; WINDOW *win = ctx->history;
ctx->hst->queue = 0;
ctx->hst->queue_lns = 0;
wclear(win); wclear(win);
int y2, x2; int y2, x2;
getmaxyx(self->window, y2, x2); getmaxyx(self->window, y2, x2);
@ -200,9 +204,6 @@ void line_info_print(ToxWindow *self)
if (x2 <= SIDEBAR_WIDTH) if (x2 <= SIDEBAR_WIDTH)
return; return;
ctx->hst->queue = 0;
ctx->hst->queue_lns = 0;
if (self->is_groupchat) if (self->is_groupchat)
wmove(win, 0, 0); wmove(win, 0, 0);
else else
@ -212,9 +213,8 @@ void line_info_print(ToxWindow *self)
int offst = self->is_groupchat ? SIDEBAR_WIDTH : 0; int offst = self->is_groupchat ? SIDEBAR_WIDTH : 0;
int numlines = 0; int numlines = 0;
while(line && numlines <= y2) { while(line && numlines++ <= y2) {
uint8_t type = line->type; uint8_t type = line->type;
numlines += line->len / (x2 - offst);
switch (type) { switch (type) {
case OUT_MSG: case OUT_MSG:

2
src/line_info.h
View File

@ -77,7 +77,7 @@ void line_info_toggle_scroll(ToxWindow *self, bool scroll);
/* clears the screen (does not delete anything) */ /* clears the screen (does not delete anything) */
void line_info_clear(struct history *hst); void line_info_clear(struct history *hst);
/* puts msg in specified line_info->msg buffer */ /* puts msg in specified line_info msg buffer */
void line_info_set(ToxWindow *self, uint32_t id, uint8_t *msg); void line_info_set(ToxWindow *self, uint32_t id, uint8_t *msg);
void line_info_init(struct history *hst); void line_info_init(struct history *hst);