about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-09-02 15:57:36 -0400
committerJune McEnroe <june@causal.agency>2020-09-02 15:57:36 -0400
commita0c8a46c750ff166c7a53a28c2bf04e04575c497 (patch)
tree781c754c981cfdf5972c71fb18de1509930ad88f
parentOnly call windowUpdate when the shown window needs updating (diff)
downloadcatgirl-a0c8a46c750ff166c7a53a28c2bf04e04575c497.tar.gz
catgirl-a0c8a46c750ff166c7a53a28c2bf04e04575c497.zip
Fix inserting blank lines BEFORE the new message
-rw-r--r--ui.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ui.c b/ui.c
index 9e86000..18af635 100644
--- a/ui.c
+++ b/ui.c
@@ -520,10 +520,12 @@ 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) {
+		bufferPush(window->buffer, COLS, heat, ts, str);
+		return;
+	}
 
-	int lines = bufferPush(window->buffer, COLS, heat, ts, str);
-	if (heat < Cold && window->ignore) return;
-
+	int lines = 0;
 	if (!window->unreadSoft++) window->unreadHard = 0;
 	if (window->mark && heat > Cold) {
 		if (!window->unreadWarm++) {
@@ -532,6 +534,7 @@ void uiWrite(uint id, enum Heat heat, const time_t *src, const char *str) {
 		if (heat > window->heat) window->heat = heat;
 		statusUpdate();
 	}
+	lines += bufferPush(window->buffer, COLS, heat, ts, str);
 	window->unreadHard += lines;
 	if (window->scroll) windowScroll(window, lines);
 	if (window == windows.ptrs[windows.show]) windowUpdate();
f='/src/commit/bin/mtags.c?id=1fdfbf9e96f638e60bf4d34aa30327e35d001a0e&follow=1'>Generate tags for sh files in mtagsJune McEnroe Only matches functions declared at the beginnings of lines, but I'm fine with that. 2021-01-20Add messy sh lexerJune McEnroe Surprisingly seems to work for everything I looked at in my repos. 2021-01-20Add all target to git.causal.agency MakefileJune McEnroe 2021-01-20Remove Lua supportJune McEnroe Lua support is unused and the dlsym fwrite/write hacks horrify me. Clean it up. 2021-01-20Fix tests for diff spansJune McEnroe 2021-01-20Avoid matching ':' in make tagsJune McEnroe Otherwise a :: rule includes one of the ':'s in the tag name. 2021-01-19Prefer tag matches not preceded by [[:alnum:]]June McEnroe Otherwise the "id" in "void" matches for "void id". 2021-01-19Escape \ and / in mtags search patternsJune McEnroe 2021-01-20Use mtags in source-filterJune McEnroe 2021-01-19Add mtags to generate tags for make and mdocJune McEnroe 2021-01-19Map tags to IDs using only [[:alnum:]-._]June McEnroe 2021-01-19Don't use a pager if reading standard inputJune McEnroe 2021-01-19Support BSD make syntax and match *.amJune McEnroe These don't really go together, but... 2021-01-19Match tab following escaped newline in make assignmentsJune McEnroe Otherwise it ends up going into Shell state. 2021-01-18Allow matching lexers using first input lineJune McEnroe