From 422fe6cd29ce014270cf8bfd6f5bcad59ce2a0ca Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Wed, 27 Jan 2021 22:52:36 -0500
Subject: Move threshold and mute indicators directly after number

I don't know why I ruled this out originally, it's more visually
pleasing to me now especially that threshold is likely to remain
set at "+" for a long time.
---
 ui.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'ui.c')

diff --git a/ui.c b/ui.c
index 7f7eb4e..23312ed 100644
--- a/ui.c
+++ b/ui.c
@@ -398,14 +398,11 @@ static void statusUpdate(void) {
 		char buf[256] = "";
 		struct Cat cat = { buf, sizeof(buf), 0 };
 		catf(
-			&cat, "\3%d%s %u ",
-			idColors[window->id], (num == windows.show ? "\26" : ""), num
+			&cat, "\3%d%s %u%s%s %s ",
+			idColors[window->id], (num == windows.show ? "\26" : ""),
+			num, window->thresh[(const char *[]) { "-", "", "+", "++" }],
+			&"="[!window->mute], idNames[window->id]
 		);
-		if (window->thresh != Cold || window->mute) {
-			const char *thresh[] = { "-", "", "+", "++" };
-			catf(&cat, "%s%s ", thresh[window->thresh], &"="[!window->mute]);
-		}
-		catf(&cat, "%s ", idNames[window->id]);
 		if (window->mark && window->unreadWarm) {
 			catf(
 				&cat, "\3%d+%d\3%d%s",
-- 
cgit 1.4.1

'/libretls/tree/compat/arc4random.h?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c'>tree</a> <a href='/libretls/commit/compat/arc4random.h?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c&amp;follow=1'>commit</a> <a href='/libretls/diff/compat/arc4random.h?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/libretls/log/compat/arc4random.h'>
<input type='hidden' name='h' value='3.3.3p1'/><input type='hidden' name='id' value='bfce2a30014ef361a15d4b653b3810fcd53d991c'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/libretls/log/?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c&amp;follow=1'>root</a>/<a href='/libretls/log/compat?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c&amp;follow=1'>compat</a>/<a href='/libretls/log/compat/arc4random.h?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c&amp;follow=1'>arc4random.h</a> (<a href='/libretls/log/compat/arc4random.h?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/libretls/log/compat/arc4random.h?h=3.3.3p1&amp;id=bfce2a30014ef361a15d4b653b3810fcd53d991c&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-29 14:47:14 -0400'>2020-09-29</span></td><td><a href='/libretls/commit/import.sh?h=3.3.3p1&amp;id=eea3cdfb26b07f4fdbb4ad570283fb1e1ea99772&amp;follow=1'>import: Add m4/ax_add_fortify_source.m4</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-08-05 11:43:02 -0400'>2020-08-05</span></td><td><a href='/libretls/commit/Makefile.am?h=3.3.3p1&amp;id=cc13f4d43a9e6f8544f347800adbbe5000b83305&amp;follow=1'>build: Add README.7 to EXTRA_DIST</a><span class='decoration'> <a class='tag-annotated-deco' href='/libretls/tag/?h=3.2.0'>3.2.0</a></span></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-08-03 22:27:18 -0400'>2020-08-03</span></td><td><a href='/libretls/commit/README.7?h=3.3.3p1&amp;id=1f76eb0e84b70024abe78149bef743a7b7699590&amp;follow=1'>doc: Indicate that only OpenSSL 1.1.1b and newer work</a></td><td>June McEnroe