diff options
| -rw-r--r-- | buffer.c | 9 | ||||
| -rw-r--r-- | chat.h | 4 | ||||
| -rw-r--r-- | ui.c | 26 |
3 files changed, 20 insertions, 19 deletions
@@ -174,7 +174,7 @@ static int flow(struct Lines *hard, int cols, const struct Line *soft) { } int bufferPush( - struct Buffer *buffer, int cols, + struct Buffer *buffer, int cols, bool ignore, enum Heat heat, time_t time, const char *str ) { struct Line *soft = linesNext(&buffer->soft); @@ -182,10 +182,11 @@ int bufferPush( soft->time = time; soft->str = strdup(str); if (!soft->str) err(EX_OSERR, "strdup"); + if (heat < Cold && ignore) return 0; return flow(&buffer->hard, cols, soft); } -void bufferReflow(struct Buffer *buffer, int cols) { +void bufferReflow(struct Buffer *buffer, int cols, bool ignore) { buffer->hard.len = 0; for (size_t i = 0; i < BufferCap; ++i) { free(buffer->hard.lines[i].str); @@ -193,6 +194,8 @@ void bufferReflow(struct Buffer *buffer, int cols) { } for (size_t i = 0; i < BufferCap; ++i) { const struct Line *soft = bufferSoft(buffer, i); - if (soft) flow(&buffer->hard, cols, soft); + if (!soft) continue; + if (soft->heat < Cold && ignore) continue; + flow(&buffer->hard, cols, soft); } } @@ -288,10 +288,10 @@ void bufferFree(struct Buffer *buffer); const struct Line *bufferSoft(const struct Buffer *buffer, size_t i); const struct Line *bufferHard(const struct Buffer *buffer, size_t i); int bufferPush( - struct Buffer *buffer, int cols, + struct Buffer *buffer, int cols, bool ignore, enum Heat heat, time_t time, const char *str ); -void bufferReflow(struct Buffer *buffer, int cols); +void bufferReflow(struct Buffer *buffer, int cols, bool ignore); enum Edit { EditHead, @@ -462,8 +462,7 @@ static void windowUpdate(void) { size_t bottom = BufferCap - 1 - window->scroll + !!window->scroll; for (size_t i = bottom; i < BufferCap; --i) { const struct Line *line = bufferHard(window->buffer, i); - if (!line) continue; - if (line->heat < Cold && window->ignore) continue; + if (!line) break; mainAdd(y, line->str); if (!y--) break; } @@ -477,8 +476,7 @@ static void windowUpdate(void) { y = MAIN_LINES - 1; for (size_t i = BufferCap - 1; i < BufferCap; --i) { const struct Line *line = bufferHard(window->buffer, i); - if (!line) continue; - if (line->heat < Cold && window->ignore) continue; + if (!line) break; mainAdd(y, line->str); if (--y < MAIN_LINES - SplitLines) break; } @@ -537,21 +535,19 @@ static void notify(uint id, const char *str) { void uiWrite(uint id, enum Heat heat, const time_t *src, const char *str) { struct Window *window = windows.ptrs[windowFor(id)]; time_t ts = (src ? *src : time(NULL)); - if (heat < Cold && window->ignore) { - window->unreadHard += bufferPush(window->buffer, COLS, heat, ts, str); - return; - } int lines = 0; - if (!window->unreadSoft++) window->unreadHard = 0; + if (heat > Ice || !window->ignore) { + if (!window->unreadSoft++) window->unreadHard = 0; + } if (window->mark && heat > Cold) { if (!window->unreadWarm++) { - lines += bufferPush(window->buffer, COLS, Cold, 0, ""); + lines += bufferPush(window->buffer, COLS, false, Cold, 0, ""); } if (heat > window->heat) window->heat = heat; statusUpdate(); } - lines += bufferPush(window->buffer, COLS, heat, ts, str); + lines += bufferPush(window->buffer, COLS, window->ignore, heat, ts, str); window->unreadHard += lines; if (window->scroll) windowScroll(window, lines); if (window == windows.ptrs[windows.show]) windowUpdate(); @@ -579,7 +575,8 @@ static void resize(void) { wclear(main); wresize(main, MAIN_LINES, COLS); for (uint num = 0; num < windows.len; ++num) { - bufferReflow(windows.ptrs[num]->buffer, COLS); + struct Window *window = windows.ptrs[num]; + bufferReflow(window->buffer, COLS, window->ignore); } windowUpdate(); } @@ -756,6 +753,7 @@ void uiCloseNum(uint num) { static void toggleIgnore(struct Window *window) { window->ignore ^= true; + bufferReflow(window->buffer, COLS, window->ignore); windowUpdate(); statusUpdate(); } @@ -789,7 +787,7 @@ static void showAuto(void) { } static void insertBlank(struct Window *window) { - int lines = bufferPush(window->buffer, COLS, Cold, 0, ""); + int lines = bufferPush(window->buffer, COLS, false, Cold, 0, ""); window->unreadHard += lines; if (window->scroll) { windowScroll(window, lines); @@ -1015,7 +1013,7 @@ void uiLoad(const char *name) { if (!time) break; enum Heat heat = (version > 2 ? readTime(file) : Cold); readString(file, &buf, &cap); - bufferPush(window->buffer, COLS, heat, time, buf); + bufferPush(window->buffer, COLS, window->ignore, heat, time, buf); } } |