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

split big function up

Browse Source
This commit is contained in:
Jfreegman 2014-03-31 21:26:09 -04:00
parent 43a5ee2d4f
commit 15815bf4bb
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/line_info.c
View File

@ -91,6 +91,22 @@ void line_info_cleanup(struct history *hst)
} }
} }
/* moves root forward and frees previous root */
static void line_info_root_fwd(struct history *hst)
{
struct line_info *tmp = hst->line_root->next;
tmp->prev = NULL;
if (hst->line_start->prev == NULL) { /* if line_start is root move it forward as well */
hst->line_start = hst->line_start->next;
hst->line_start->prev = NULL;
++hst->start_id;
}
free(hst->line_root);
hst->line_root = tmp;
}
void line_info_add(ToxWindow *self, uint8_t *tmstmp, uint8_t *name1, uint8_t *name2, uint8_t *msg, void line_info_add(ToxWindow *self, uint8_t *tmstmp, uint8_t *name1, uint8_t *name2, uint8_t *msg,
uint8_t type, uint8_t bold, uint8_t colour) uint8_t type, uint8_t bold, uint8_t colour)
{ {
@ -141,19 +157,9 @@ void line_info_add(ToxWindow *self, uint8_t *tmstmp, uint8_t *name1, uint8_t *na
hst->line_end->next = new_line; hst->line_end->next = new_line;
hst->line_end = new_line; hst->line_end = new_line;
/* If chat history exceeds limit move root forward and free old root */
if (++hst->line_items > MAX_HISTORY) { if (++hst->line_items > MAX_HISTORY) {
struct line_info *tmp = hst->line_root->next; --hst->line_items;
tmp->prev = NULL; line_info_root_fwd(hst);
if (hst->line_start->prev == NULL) { /* if line_start is root move it forward as well */
hst->line_start = hst->line_start->next;
hst->line_start->prev = NULL;
++hst->start_id;
}
free(hst->line_root);
hst->line_root = tmp;
} }
int newlines = 0; int newlines = 0;
@ -180,11 +186,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->start_id; ++hst->start_id;
lines -= (1 + hst->line_start->len / (x2 - offst)); lines -= (1 + hst->line_start->len / (x2 - offst));
if (!hst->scroll_mode) if (!hst->scroll_mode && hst->line_start->next)
hst->line_start = hst->line_start->next; hst->line_start = hst->line_start->next;
} }
} }