about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-08-04 17:59:43 -0400
committerJune McEnroe <june@causal.agency>2018-08-04 17:59:43 -0400
commit7b5bc5aa4185ddbb14a8c7ac71dc0ec200ec00b4 (patch)
treee9cd004f115904dcad683329288f432ea6dfcf98
parentRename client to irc (diff)
downloadcatgirl-7b5bc5aa4185ddbb14a8c7ac71dc0ec200ec00b4.tar.gz
catgirl-7b5bc5aa4185ddbb14a8c7ac71dc0ec200ec00b4.zip
Rename ui chat to log
-rw-r--r--chat.c2
-rw-r--r--chat.h2
-rw-r--r--handle.c4
-rw-r--r--input.c2
-rw-r--r--ui.c28
5 files changed, 19 insertions, 19 deletions
diff --git a/chat.c b/chat.c
index f52bc3a..cbd9790 100644
--- a/chat.c
+++ b/chat.c
@@ -68,7 +68,7 @@ int main(int argc, char *argv[]) {
 	chat.user = strdup(chat.nick);
 
 	uiInit();
-	uiChat("Traveling...");
+	uiLog("Traveling...");
 	uiDraw();
 
 	int sock = ircConnect(host, port, webPass);
diff --git a/chat.h b/chat.h
index 04e3c6b..e63e0cf 100644
--- a/chat.h
+++ b/chat.h
@@ -40,7 +40,7 @@ void uiHide(void);
 void uiDraw(void);
 void uiRead(void);
 void uiTopic(const char *topic);
-void uiChat(const char *line);
+void uiLog(const char *line);
 
 __attribute__((format(printf, 1, 2)))
 void uiFmt(const char *format, ...);
diff --git a/handle.c b/handle.c
index 7bbf3e7..fa13ca8 100644
--- a/handle.c
+++ b/handle.c
@@ -58,9 +58,9 @@ static void handle432(char *prefix, char *params) {
 	shift(&params);
 	shift(&params);
 	char *mesg = shift(&params);
-	uiChat("You can't use that name here");
+	uiLog("You can't use that name here");
 	uiFmt("Sheriff says, \"%s\"", mesg);
-	uiChat("Type /nick <name> to choose a new one");
+	uiLog("Type /nick <name> to choose a new one");
 }
 
 static void handle001(char *prefix, char *params) {
diff --git a/input.c b/input.c
index 53957ec..51fe947 100644
--- a/input.c
+++ b/input.c
@@ -60,7 +60,7 @@ static void inputNick(wchar_t *params) {
 	if (nick) {
 		ircFmt("NICK %ls\r\n", nick);
 	} else {
-		uiChat("/nick requires a name");
+		uiLog("/nick requires a name");
 	}
 }
 
diff --git a/ui.c b/ui.c
index 341025c..b014668 100644
--- a/ui.c
+++ b/ui.c
@@ -37,12 +37,12 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 
 static const int TOPIC_COLS = 512;
-static const int CHAT_LINES = 100;
 static const int INPUT_COLS = 512;
+static const int LOG_LINES = 100;
 
 static struct {
 	WINDOW *topic;
-	WINDOW *chat;
+	WINDOW *log;
 	WINDOW *input;
 	size_t cursor;
 } ui;
@@ -67,10 +67,10 @@ void uiInit(void) {
 	ui.topic = newpad(2, TOPIC_COLS);
 	mvwhline(ui.topic, 1, 0, ACS_HLINE, TOPIC_COLS);
 
-	ui.chat = newpad(CHAT_LINES, COLS);
-	wsetscrreg(ui.chat, 0, CHAT_LINES - 1);
-	scrollok(ui.chat, true);
-	wmove(ui.chat, CHAT_LINES - (LINES - 4) - 1, 0);
+	ui.log = newpad(LOG_LINES, COLS);
+	wsetscrreg(ui.log, 0, LOG_LINES - 1);
+	scrollok(ui.log, true);
+	wmove(ui.log, LOG_LINES - (LINES - 4) - 1, 0);
 
 	ui.input = newpad(2, INPUT_COLS);
 	mvwhline(ui.input, 0, 0, ACS_HLINE, INPUT_COLS);
@@ -79,8 +79,8 @@ void uiInit(void) {
 }
 
 static void uiResize(void) {
-	wresize(ui.chat, CHAT_LINES, COLS);
-	wmove(ui.chat, CHAT_LINES - 1, COLS - 1);
+	wresize(ui.log, LOG_LINES, COLS);
+	wmove(ui.log, LOG_LINES - 1, COLS - 1);
 }
 
 void uiHide(void) {
@@ -98,8 +98,8 @@ void uiDraw(void) {
 		1, lastCol
 	);
 	pnoutrefresh(
-		ui.chat,
-		CHAT_LINES - (LINES - 4), 0,
+		ui.log,
+		LOG_LINES - (LINES - 4), 0,
 		2, 0,
 		lastLine - 2, lastCol
 	);
@@ -194,9 +194,9 @@ void uiTopic(const char *topic) {
 	uiAdd(ui.topic, topic);
 }
 
-void uiChat(const char *line) {
-	waddch(ui.chat, '\n');
-	uiAdd(ui.chat, line);
+void uiLog(const char *line) {
+	waddch(ui.log, '\n');
+	uiAdd(ui.log, line);
 }
 
 void uiFmt(const char *format, ...) {
@@ -206,7 +206,7 @@ void uiFmt(const char *format, ...) {
 	vasprintf(&buf, format, ap);
 	va_end(ap);
 	if (!buf) err(EX_OSERR, "vasprintf");
-	uiChat(buf);
+	uiLog(buf);
 	free(buf);
 }