summary refs log tree commit diff
path: root/ui.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ui.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/ui.c b/ui.c
index c8f53ff..f44ff05 100644
--- a/ui.c
+++ b/ui.c
@@ -33,6 +33,8 @@
 #define A_ITALIC A_NORMAL
 #endif
 
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
 static const int TOPIC_COLS = 512;
 static const int CHAT_LINES = 100;
 static const int INPUT_COLS = 512;
@@ -41,6 +43,7 @@ static struct {
 	WINDOW *topic;
 	WINDOW *chat;
 	WINDOW *input;
+	size_t cursor;
 } ui;
 
 void uiInit(void) {
@@ -70,7 +73,7 @@ void uiInit(void) {
 
 	ui.input = newpad(2, INPUT_COLS);
 	mvwhline(ui.input, 0, 0, ACS_HLINE, INPUT_COLS);
-	wmove(ui.input, 1, 0);
+	wmove(ui.input, 1, ui.cursor);
 	nodelay(ui.input, true);
 }
 
@@ -84,17 +87,20 @@ void uiHide(void) {
 }
 
 void uiDraw(void) {
-	pnoutrefresh(ui.topic, 0, 0, 0, 0, 1, COLS - 1);
+	int lastCol = COLS - 1;
+	int lastLine = LINES - 1;
+
+	pnoutrefresh(ui.topic, 0, 0, 0, 0, 1, lastCol);
 	pnoutrefresh(
 		ui.chat,
-		CHAT_LINES - (LINES - 4), 0,
-		2, 0, LINES - 1, COLS - 1
+		CHAT_LINES - (lastLine - 4), 0,
+		2, 0, lastLine, lastCol
 	);
 	pnoutrefresh(
 		ui.input,
-		0, 0,
-		LINES - 2, 0,
-		LINES - 1, COLS - 1
+		0, MAX(0, ui.cursor - lastCol),
+		lastLine - 1, 0,
+		lastLine, lastCol
 	);
 	doupdate();
 }
@@ -213,6 +219,7 @@ void uiRead(void) {
 				len = 0;
 			}
 			break; default: {
+				// TODO: Check overflow
 				if (iswprint(ch)) buf[len++] = ch;
 			}
 		}
@@ -220,4 +227,5 @@ void uiRead(void) {
 	wmove(ui.input, 1, 0);
 	waddnwstr(ui.input, buf, len);
 	wclrtoeol(ui.input);
+	ui.cursor = len;
 }
amp;follow=1'>Revert "Test getopt_config"June McEnroe This reverts commit c8a771828e1d5fc8c476bbd650fafcfb7ba390a8. It just feels gross... idk. 2019-11-11Test getopt_configJune McEnroe 2019-11-11Add userhost-in-names to manualJune McEnroe 2019-11-11Skip initial NAMES parametersJune McEnroe Channel names can contain '!' so splitting the whole message on it won't work. I hate this code though. 2019-11-11Filter userhost-in-namesJune McEnroe I really want to be writing tests for these functions... 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