aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

separator: Print only one for each chat window

Browse Source 
So far we printed one after the last received message, which doesn't
make much sense of course.
Now only print one if there is not already one present.
This commit is contained in:
Michael Vetter 2019-12-13 12:47:27 +01:00
parent a1ed37953c
commit e2b44a69bd
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/ui/window.c
View File

@ -1673,8 +1673,10 @@ win_redraw(ProfWin *window)
ProfBuffEntry *e = buffer_get_entry(window->layout->buffer, i); ProfBuffEntry *e = buffer_get_entry(window->layout->buffer, i);
if (e->from == NULL && e->message && e->message[0] == '-') { if (e->from == NULL && e->message && e->message[0] == '-') {
// just an indicator to print the separator not the actual message
win_print_separator(window); win_print_separator(window);
} else { } else {
// regular thing to print
_win_print(window, e->show_char, e->pad_indent, e->time, e->flags, e->theme_item, e->from, e->message, e->receipt); _win_print(window, e->show_char, e->pad_indent, e->time, e->flags, e->theme_item, e->from, e->message, e->receipt);
} }
} }
@ -1837,12 +1839,26 @@ win_handle_command_exec_result_note(ProfWin *window, const char *const type, con
void void
win_insert_last_read_position_marker(ProfWin *window, char* id) win_insert_last_read_position_marker(ProfWin *window, char* id)
{ {
int i, size;
size = buffer_size(window->layout->buffer);
// TODO: this is somewhat costly. We should improve this later.
// check if we already have a separator present
for (i = 0; i < size; i++) {
ProfBuffEntry *e = buffer_get_entry(window->layout->buffer, i);
// if yes, don't print a new one
if (e->id && (g_strcmp0(e->id, id) == 0)) {
return;
}
}
GDateTime *time = g_date_time_new_now_local(); GDateTime *time = g_date_time_new_now_local();
// the separator will actually be print in win_redraw().
// this only puts it in the buffer and win_redraw() will interpret it.
// so that we have the correct length even when resizing.
buffer_append(window->layout->buffer, ' ', 0, time, 0, THEME_TEXT, NULL, "-", NULL, id); buffer_append(window->layout->buffer, ' ', 0, time, 0, THEME_TEXT, NULL, "-", NULL, id);
// can we leave this? TODO
// win_print_separator(window);
//_win_print(window, '-', 0, time, 0, THEME_TEXT, NULL, "---", NULL);
win_redraw(window); win_redraw(window);
g_date_time_unref(time); g_date_time_unref(time);