summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-12-08 12:58:22 -0500
committerJune McEnroe <june@causal.agency>2018-12-08 13:18:13 -0500
commit14c60a15bca704873f88f46495559ee7d698f985 (patch)
tree79e37e5e91b7e3f58d13c8afbc1ecc49dea0f53e
parentAdd /raw command (diff)
downloadcatgirl-14c60a15bca704873f88f46495559ee7d698f985.tar.gz
catgirl-14c60a15bca704873f88f46495559ee7d698f985.zip
Add uint typedef
-rw-r--r--chat.h1
-rw-r--r--term.c2
-rw-r--r--ui.c9
3 files changed, 7 insertions, 5 deletions
diff --git a/chat.h b/chat.h
index eaecb50..1deb693 100644
--- a/chat.h
+++ b/chat.h
@@ -30,6 +30,7 @@
 #define err(...) do { uiHide(); err(__VA_ARGS__); } while (0)
 #define errx(...) do { uiHide(); errx(__VA_ARGS__); } while (0)
 
+typedef unsigned uint;
 typedef unsigned char byte;
 
 struct {
diff --git a/term.c b/term.c
index 2be9c16..75380ea 100644
--- a/term.c
+++ b/term.c
@@ -51,7 +51,7 @@ void termMode(enum TermMode mode, bool set) {
 enum { Esc = '\33' };
 
 enum TermEvent termEvent(char ch) {
-	static int state = 0;
+	static uint state = 0;
 	switch (T(state, ch)) {
 		case T(0, Esc): state = 1; return 0;
 		case T(1, '['): state = 2; return 0;
diff --git a/ui.c b/ui.c
index 9ffe8ad..e437ef9 100644
--- a/ui.c
+++ b/ui.c
@@ -68,8 +68,9 @@ static short pair8(short pair) {
 struct View {
 	struct Tag tag;
 	WINDOW *log;
-	int scroll, unread;
+	int scroll;
 	bool hot, mark;
+	uint unread;
 	struct View *prev;
 	struct View *next;
 };
@@ -227,7 +228,7 @@ static void uiTitle(const struct View *view) {
 	int unread;
 	char *str;
 	int len = asprintf(
-		&str, "%s%n (%d)", view->tag.name, &unread, view->unread
+		&str, "%s%n (%u)", view->tag.name, &unread, view->unread
 	);
 	if (len < 0) err(EX_OSERR, "asprintf");
 	if (!view->unread) str[unread] = '\0';
@@ -244,7 +245,7 @@ static void uiStatus(void) {
 		int unread;
 		wchar_t *str;
 		int len = aswprintf(
-			&str, L"%c %d %s %n(\3%02d%d\3) ",
+			&str, L"%c %d %s %n(\3%02d%u\3) ",
 			(view == ui.view ? IRCReverse : IRCReset),
 			num, view->tag.name,
 			&unread, (view->hot ? IRCYellow : IRCDefault), view->unread
@@ -274,7 +275,7 @@ static void viewRemove(struct View *view) {
 	views.tags[view->tag.id] = NULL;
 }
 
-static const int LogLines = 256;
+static const int LogLines = 512;
 
 static struct View *viewTag(struct Tag tag) {
 	struct View *view = views.tags[tag.id];
>Add The Bone Shard EmperorJune McEnroe Suffers a little bit from middle book but I really enjoyed it. Read it faster than the first one too, despite its length. 2022-06-25Bump xterm font size to 12June McEnroe 2022-06-10Handle subshells (and functions) inside substitutionsJune McEnroe 2022-06-10Switch to jorts Install scriptJune McEnroe 2022-06-08Indicate if still reading or no resultsJune McEnroe 2022-06-08Add Maiden, Mother, CroneJune McEnroe Mixed bag like most collections of short stories. Some of them are pretty good. The author of the worst written story also has the worst written bio. 2022-06-05FIRST SHOW IN 2.5 YEARS BABEY!!!June McEnroe 2022-06-03Set line number on File linesJune McEnroe 2022-06-03Stop polling stdin after EOFJune McEnroe 2022-06-02Set TABSIZE=4June McEnroe Absolutely indiscriminately. 2022-06-02Do basic match highlightingJune McEnroe 2022-06-02Clean up parsing a littleJune McEnroe 2022-06-02Don't duplicate path stringJune McEnroe 2022-06-02Use stderr instead of /dev/tty, realloc buffer if lines too longJune McEnroe For some reason I haven't been able to figure out, trying to poll /dev/tty returns POLLNVAL (and this was using 100% CPU looping), but using stderr instead works fine. 2022-06-02Add initial working version of qfJune McEnroe 2022-05-29Set prompt for okshJune McEnroe