From e20c64d5d72e341abf8dc3cb38d7cfec371faafc Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Fri, 22 Feb 2019 14:11:50 -0500
Subject: Reorganize UI code for the umpteenth time

It's actually in a good state now, I think.
---
 input.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'input.c')

diff --git a/input.c b/input.c
index f91d11b..32c7e2b 100644
--- a/input.c
+++ b/input.c
@@ -80,11 +80,7 @@ static void inputJoin(struct Tag tag, char *params) {
 }
 
 static void inputPart(struct Tag tag, char *params) {
-	if (params) {
-		ircFmt("PART %s :%s\r\n", tag.name, params);
-	} else {
-		ircFmt("PART %s :Goodbye\r\n", tag.name);
-	}
+	ircFmt("PART %s :%s\r\n", tag.name, params ? params : "Goodbye");
 }
 
 static void inputQuery(struct Tag tag, char *params) {
@@ -92,7 +88,7 @@ static void inputQuery(struct Tag tag, char *params) {
 	char *nick = param(tag, "/query", &params, "nick");
 	if (!nick) return;
 	tabTouch(TagNone, nick);
-	uiWindowTag(tagFor(nick));
+	uiShowTag(tagFor(nick));
 	logReplay(tagFor(nick));
 }
 
@@ -118,11 +114,7 @@ static void inputTopic(struct Tag tag, char *params) {
 
 static void inputQuit(struct Tag tag, char *params) {
 	(void)tag;
-	if (params) {
-		ircQuit(params);
-	} else {
-		ircQuit("Goodbye");
-	}
+	ircQuit(params ? params : "Goodbye");
 }
 
 static void inputURL(struct Tag tag, char *params) {
@@ -145,11 +137,11 @@ static void inputWindow(struct Tag tag, char *params) {
 	if (!name) return;
 	int num = strtol(name, &name, 0);
 	if (!name[0]) {
-		uiWindowNum(num);
+		uiShowNum(num);
 	} else {
 		struct Tag tag = tagFind(name);
 		if (tag.id != TagNone.id) {
-			uiWindowTag(tag);
+			uiShowTag(tag);
 		} else {
 			uiFmt(tag, UIHot, "No window for %s", name);
 		}
-- 
cgit 1.4.0