summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-10 17:54:16 -0500
committerJune McEnroe <june@causal.agency>2020-02-10 17:54:16 -0500
commit65603d5138b54efc53c04e756631ab8eeddee7fb (patch)
tree3a4ec382e0e81f71db7067576f09e18edd5e3ccb
parentEliminate array in hash (diff)
downloadcatgirl-65603d5138b54efc53c04e756631ab8eeddee7fb.tar.gz
catgirl-65603d5138b54efc53c04e756631ab8eeddee7fb.zip
Show heat and other unread in title
Diffstat (limited to '')
-rw-r--r--ui.c35
1 files changed, 21 insertions, 14 deletions
diff --git a/ui.c b/ui.c
index 3f730d2..9a070a6 100644
--- a/ui.c
+++ b/ui.c
@@ -359,38 +359,45 @@ static void statusAdd(const char *str) {
 }
 
 static void statusUpdate(void) {
+	int otherUnread = 0;
+	enum Heat otherHeat = Cold;
 	wmove(status, 0, 0);
+
 	int num;
 	const struct Window *window;
 	for (num = 0, window = windows.head; window; ++num, window = window->next) {
 		if (!window->heat && window != windows.active) continue;
-		int unread;
+		if (window != windows.active) {
+			otherUnread += window->unreadCount;
+			if (window->heat > otherHeat) otherHeat = window->heat;
+		}
+		int trunc;
 		char buf[256];
 		snprintf(
 			buf, sizeof(buf), "\3%d%s %d %s %n(\3%02d%d\3%d) ",
 			idColors[window->id], (window == windows.active ? "\26" : ""),
 			num, idNames[window->id],
-			&unread, (window->heat > Warm ? White : idColors[window->id]),
+			&trunc, (window->heat > Warm ? White : idColors[window->id]),
 			window->unreadCount,
 			idColors[window->id]
 		);
-		if (!window->mark || !window->unreadCount) buf[unread] = '\0';
+		if (!window->mark || !window->unreadCount) buf[trunc] = '\0';
 		statusAdd(buf);
 	}
 	wclrtoeol(status);
+	if (!to_status_line) return;
 
-	int unread;
-	char buf[256];
-	snprintf(
-		buf, sizeof(buf), "%s %s%n (%d)",
-		self.network, idNames[windows.active->id],
-		&unread, windows.active->unreadCount
-	);
-	if (!windows.active->mark || !windows.active->unreadCount) {
-		buf[unread] = '\0';
-	}
+	window = windows.active;
 	putp(to_status_line);
-	putp(buf);
+	printf("%s %s", self.network, idNames[window->id]);
+	if (window->mark && window->unreadCount) {
+		printf(
+			" (%d%s)", window->unreadCount, (window->heat > Warm ? "!" : "")
+		);
+	}
+	if (otherUnread) {
+		printf(" (+%d%s)", otherUnread, (otherHeat > Warm ? "!" : ""));
+	}
 	putp(from_status_line);
 	fflush(stdout);
 }
/commit/ui-shared.h?id=898b9e19e0eacd67456ddcc91ff173055e1c0e99&follow=1'>auth-filter: pass url with query string attachedJason A. Donenfeld Otherwise redirections come out wrong. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-11-21git: use xz compressed archive for downloadChristian Hesse Upstream will stop providing gz compressed source tarballs [0], so stop using them. [0] https://lists.zx2c4.com/pipermail/cgit/2018-November/004254.html Signed-off-by: Christian Hesse <mail@eworm.de> 2018-10-12git: update to v2.19.1Christian Hesse Update to git version v2.19.1. Required changes follow upstream commits: * commit: add repository argument to get_cached_commit_buffer (3ce85f7e5a41116145179f0fae2ce6d86558d099) * commit: add repository argument to lookup_commit_reference (2122f6754c93be8f02bfb5704ed96c88fc9837a8) * object: add repository argument to parse_object (109cd76dd3467bd05f8d2145b857006649741d5c) * tag: add repository argument to deref_tag (a74093da5ed601a09fa158e5ba6f6f14c1142a3e) * tag: add repository argument to lookup_tag (ce71efb713f97f476a2d2ab541a0c73f684a5db3) * tree: add repository argument to lookup_tree (f86bcc7b2ce6cad68ba1a48a528e380c6126705e) * archive.c: avoid access to the_index (b612ee202a48f129f81f8f6a5af6cf71d1a9caef) * for_each_*_object: move declarations to object-store.h (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b) Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-ssdiff: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-shared: ban strcat()Christian Hesse Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 To avoid compiler warnings from gcc 8.1.x we get the hard way. Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-patch: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11ui-log: ban strcpy()Christian Hesse Git upstream bans strcpy() with commit: automatically ban strcpy() c8af66ab8ad7cd78557f0f9f5ef6a52fd46ee6dd Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban sprintf()Christian Hesse Git upstream bans sprintf() with commit: banned.h: mark sprintf() as banned cc8fdaee1eeaf05d8dd55ff11f111b815f673c58 Signed-off-by: Christian Hesse <mail@eworm.de> 2018-09-11parsing: ban strncpy()Christian Hesse Git upstream bans strncpy() with commit: banned.h: mark strncpy() as banned e488b7aba743d23b830d239dcc33d9ca0745a9ad Signed-off-by: Christian Hesse <mail@eworm.de> 2018-08-28filters: generate anchor links from markdownChristian Hesse This makes the markdown filter generate anchor links for headings. Signed-off-by: Christian Hesse <mail@eworm.de> Tested-by: jean-christophe manciot <actionmystique@gmail.com> 2018-08-03Bump version.Jason A. Donenfeld Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2018-08-03clone: fix directory traversalJason A. Donenfeld This was introduced in the initial version of this code, way back when in 2008. $ curl http://127.0.0.1/cgit/repo/objects/?path=../../../../../../../../../etc/passwd root:x:0:0:root:/root:/bin/sh ... Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reported-by: Jann Horn <jannh@google.com> 2018-08-03config: record repo.snapshot-prefix in the per-repo configKonstantin Ryabitsev