about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-10 21:24:30 -0500
committerJune McEnroe <june@causal.agency>2020-02-10 21:24:30 -0500
commit90eff04eda86e0a75b0e81960e2166193c366be7 (patch)
treeb35bfb3fb04aaacea8c897a36f9a0d8e3a48dfce
parentManually raise SIGINT from C-c (diff)
downloadcatgirl-90eff04eda86e0a75b0e81960e2166193c366be7.tar.gz
catgirl-90eff04eda86e0a75b0e81960e2166193c366be7.zip
Only write out title on uiDraw
Diffstat (limited to '')
-rw-r--r--ui.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/ui.c b/ui.c
index 903c4af..297fd7b 100644
--- a/ui.c
+++ b/ui.c
@@ -268,6 +268,8 @@ void uiInit(void) {
 	uiShow();
 }
 
+static char title[256];
+
 void uiDraw(void) {
 	if (hidden) return;
 	wnoutrefresh(status);
@@ -291,6 +293,12 @@ void uiDraw(void) {
 		BOTTOM, RIGHT
 	);
 	doupdate();
+
+	if (!to_status_line) return;
+	putp(to_status_line);
+	putp(title);
+	putp(from_status_line);
+	fflush(stdout);
 }
 
 struct Style {
@@ -396,21 +404,21 @@ static void statusUpdate(void) {
 		statusAdd(buf);
 	}
 	wclrtoeol(status);
-	if (!to_status_line) return;
 
 	window = windows.active;
-	putp(to_status_line);
-	printf("%s %s", self.network, idNames[window->id]);
+	snprintf(title, sizeof(title), "%s %s", self.network, idNames[window->id]);
 	if (window->mark && window->unreadCount) {
-		printf(
+		snprintf(
+			&title[strlen(title)], sizeof(title) - strlen(title),
 			" (%d%s)", window->unreadCount, (window->heat > Warm ? "!" : "")
 		);
 	}
 	if (otherUnread) {
-		printf(" (+%d%s)", otherUnread, (otherHeat > Warm ? "!" : ""));
+		snprintf(
+			&title[strlen(title)], sizeof(title) - strlen(title),
+			" (+%d%s)", otherUnread, (otherHeat > Warm ? "!" : "")
+		);
 	}
-	putp(from_status_line);
-	fflush(stdout);
 }
 
 static void mark(struct Window *window) {
2019-11-10Compare words without copying in filtersJune McEnroe 2019-11-10Separate tags from all targetJune McEnroe 2019-11-10Filter invite-notifyJune McEnroe 2019-11-10Add capsicum note to READMEJune McEnroe 2019-11-10Filter extended-joinJune McEnroe 2019-11-10Expand client configuration documentation and list capabilitiesJune McEnroe 2019-11-10Request all supported caps from serverJune McEnroe 2019-11-10Filter ACCOUNT, AWAY, CHGHOST for incapable clientsJune McEnroe 2019-11-10Rename listen to localJune McEnroe 2019-11-09Remove extended-join and invite-notifyJune McEnroe The remaining caps only generate new commands which can easily be filtered out when sending to clients so will be in the first pass of support. extended-join is probably safe to pass through unaltered, just causing extraneous parameters on JOIN commands, but maybe not. invite-notify reuses the INVITE command where the invited user is not self. 2019-11-09Maintain stateCaps and offer them to clientsJune McEnroe 2019-11-09Parse capabilitiesJune McEnroe The list that I've defined are the ones that I expect to be able to enable probably without any clients breaking... And of course server-time which pounce implements itself. 2019-11-09Avoid the reserved _A names with BIT macroJune McEnroe 2019-11-09Define macro for bit flag enumsJune McEnroe 2019-11-08Check that password is hashedJune McEnroe 2019-11-08Avoid calling getopt_long again after it returns -1June McEnroe On GNU, calling getopt_long again will reset optind back to the first non-option argument, which would cause an infinite loop of reading the same configurtion file forever. 2019-11-08Only change AWAY status for registered clientsJune McEnroe Turns out I did eventually fix this, because I may want to implement "passive clients" for logging or notification stuff, which wouldn't affect AWAY status either. 2019-11-07Just write the example normallyJune McEnroe 2019-11-07Include path in readlinkat errorJune McEnroe 2019-11-07Call clientConsume before clientRecvJune McEnroe This might reduce the frequency of a client getting its own message back because it was behind in the ring when it sent it. 2019-11-06Use -l:filename in Linux.mkJune McEnroe 2019-11-06Fix compat.h for #defined strlcpyJune McEnroe 2019-11-06Allow unsetting LIBRESSL_PREFIXJune McEnroe 2019-11-06Document calico service configurationJune McEnroe 2019-11-06Document SASL EXTERNAL configuration in more detailJune McEnroe 2019-11-06Document pounce service configurationJune McEnroe 2019-11-06Mention Darwin and GNU/Linux in READMEJune McEnroe 2019-11-06Assume LibreSSL from brew on DarwinJune McEnroe 2019-11-06Remove -DNO_EXPLICIT_BZERO from Darwin.mkJune McEnroe 2019-11-06Don't install rc scripts or dirs on LinuxJune McEnroe