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

properly flag lines with unread mark

Browse Source
This commit is contained in:
Jfreegman 2014-09-07 22:26:07 -04:00
parent 416ebc9ab8
commit 09f90d095b
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/line_info.c
View File

@ -156,15 +156,13 @@ void line_info_add(ToxWindow *self, char *timestr, char *name1, char *name2, uin
/* for type-specific formatting in print function */ /* for type-specific formatting in print function */
switch (type) { switch (type) {
case IN_ACTION: case IN_ACTION:
case OUT_ACTION:
len += 3; len += 3;
break; break;
case OUT_ACTION: case IN_MSG:
len += 5;
break;
case OUT_MSG: case OUT_MSG:
len += 4; len += 2;
break; break;
case CONNECTION: case CONNECTION:
@ -214,6 +212,7 @@ void line_info_add(ToxWindow *self, char *timestr, char *name1, char *name2, uin
new_line->type = type; new_line->type = type;
new_line->bold = bold; new_line->bold = bold;
new_line->colour = colour; new_line->colour = colour;
new_line->noread_flag = false;
new_line->timestamp = get_unix_time(); new_line->timestamp = get_unix_time();
hst->queue[hst->queue_sz++] = new_line; hst->queue[hst->queue_sz++] = new_line;
@ -320,6 +319,11 @@ void line_info_print(ToxWindow *self)
wattron(win, COLOR_PAIR(RED)); wattron(win, COLOR_PAIR(RED));
wprintw(win, " x", line->msg); wprintw(win, " x", line->msg);
wattroff(win, COLOR_PAIR(RED)); wattroff(win, COLOR_PAIR(RED));
if (line->noread_flag == false) {
line->noread_flag = true;
line->len += 2;
}
} }
wprintw(win, "\n", line->msg); wprintw(win, "\n", line->msg);
@ -340,6 +344,11 @@ void line_info_print(ToxWindow *self)
wattron(win, COLOR_PAIR(RED)); wattron(win, COLOR_PAIR(RED));
wprintw(win, " x", line->msg); wprintw(win, " x", line->msg);
wattroff(win, COLOR_PAIR(RED)); wattroff(win, COLOR_PAIR(RED));
if (line->noread_flag == false) {
line->noread_flag = true;
line->len += 2;
}
} }
wprintw(win, "\n", line->msg); wprintw(win, "\n", line->msg);

1
src/line_info.h
View File

@ -52,6 +52,7 @@ struct line_info {
uint8_t type; uint8_t type;
uint8_t bold; uint8_t bold;
uint8_t colour; uint8_t colour;
uint8_t noread_flag; /* true if a line should be flagged as unread */
uint32_t id; uint32_t id;
uint16_t len; /* combined len of entire line */ uint16_t len; /* combined len of entire line */
uint8_t newlines; uint8_t newlines;

6
src/message_queue.c
View File

@ -70,8 +70,10 @@ static void cqueue_mark_read(ToxWindow *self, uint32_t id, uint8_t type)
if (line->id == id) { if (line->id == id) {
line->type = type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ; line->type = type == OUT_ACTION ? OUT_ACTION_READ : OUT_MSG_READ;
if (timed_out(line->timestamp, get_unix_time(), CQUEUE_TRY_SEND_INTERVAL)) if (line->noread_flag == true) {
line->len -= 2; /* removes " x" */ line->len -= 2;
line->noread_flag = false;
}
return; return;
} }