oasis

commit: 77664b07c75876f612481cd2d658be26dbda7e80
parent acbd5b328d6199ebb9da53c595fb1ae0615f4c1e
Author: Michael Forney <mforney@mforney.org>
Date:   Tue,  2 Mar 2021 01:06:35 -0800

catgirl: Update to 1.6

Diffstat:
M
pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch
65
+++++++++++++++++++++++++++++++++++++----------------------------
M
pkg/catgirl/ver
2
+-

2 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch b/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch
@@ -1,4 +1,4 @@
-From 05c4bb1ccf5a8d92cbde7df66a9a119ba89e6e78 Mon Sep 17 00:00:00 2001
+From fceb6d1300a651bf4bb544978c743330f98d3ead Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 7 May 2020 00:36:14 -0700
 Subject: [PATCH] Revert "Use gnu-case-range and
@@ -10,9 +10,9 @@ This reverts commit 75a6aa9258270169f43f56e063f1bfb57eebe56b.
  command.c  | 32 ++++++++++++++++++--------------
  complete.c |  4 ++--
  handle.c   | 45 +++++++++++++++++++++++++++------------------
- ui.c       |  7 ++++++-
+ ui.c       |  9 +++++++--
  url.c      |  2 +-
- 6 files changed, 55 insertions(+), 38 deletions(-)
+ 6 files changed, 56 insertions(+), 39 deletions(-)
 
 diff --git a/Makefile b/Makefile
 index 5caa3ba..d164315 100644
@@ -29,7 +29,7 @@ index 5caa3ba..d164315 100644
  
  -include config.mk
 diff --git a/command.c b/command.c
-index 998d9a2..27e7f98 100644
+index 1154942..93b7478 100644
 --- a/command.c
 +++ b/command.c
 @@ -69,8 +69,8 @@ static void splitMessage(char *cmd, uint id, char *params) {
@@ -127,13 +127,13 @@ index 998d9a2..27e7f98 100644
  	execl(shell, shell, "-c", params, NULL);
  	warn("%s", shell);
  	_exit(EX_UNAVAILABLE);
-@@ -464,7 +467,8 @@ static void commandHelp(uint id, char *params) {
+@@ -468,7 +471,8 @@ static void commandHelp(uint id, char *params) {
  	if (pid) return;
  
  	char buf[256];
--	snprintf(buf, sizeof(buf), "%spCOMMANDS$", (getenv("LESS") ?: ""));
+-	snprintf(buf, sizeof(buf), "%sp^COMMANDS$", (getenv("LESS") ?: ""));
 +	const char *less = getenv("LESS");
-+	snprintf(buf, sizeof(buf), "%spCOMMANDS$", (less ? less : ""));
++	snprintf(buf, sizeof(buf), "%sp^COMMANDS$", (less ? less : ""));
  	setenv("LESS", buf, 1);
  	execlp("man", "man", "1", "catgirl", NULL);
  	dup2(utilPipe[1], STDERR_FILENO);
@@ -160,10 +160,10 @@ index 5835926..0e1de47 100644
  }
  
 diff --git a/handle.c b/handle.c
-index ddf43e8..7b3c096 100644
+index 44001bb..caba5ff 100644
 --- a/handle.c
 +++ b/handle.c
-@@ -292,9 +292,9 @@ static void handleReplyISupport(struct Message *msg) {
+@@ -290,9 +290,9 @@ static void handleReplyISupport(struct Message *msg) {
  			set(&network.setParamModes, setParam);
  			set(&network.channelModes, channel);
  		} else if (!strcmp(key, "EXCEPTS")) {
@@ -175,7 +175,7 @@ index ddf43e8..7b3c096 100644
  		}
  	}
  }
-@@ -347,7 +347,7 @@ static void handleJoin(struct Message *msg) {
+@@ -345,7 +345,7 @@ static void handleJoin(struct Message *msg) {
  		"\3%02d%s\3\t%s%s%sarrives in \3%02d%s\3",
  		hash(msg->user), msg->nick,
  		(msg->params[2] ? "(" : ""),
@@ -184,7 +184,7 @@ index ddf43e8..7b3c096 100644
  		(msg->params[2] ? ") " : ""),
  		hash(msg->params[0]), msg->params[0]
  	);
-@@ -379,12 +379,14 @@ static void handlePart(struct Message *msg) {
+@@ -377,12 +377,14 @@ static void handlePart(struct Message *msg) {
  		id, heat, tagTime(msg),
  		"\3%02d%s\3\tleaves \3%02d%s\3%s%s",
  		hash(msg->user), msg->nick, hash(msg->params[0]), msg->params[0],
@@ -201,7 +201,7 @@ index ddf43e8..7b3c096 100644
  	);
  }
  
-@@ -401,12 +403,14 @@ static void handleKick(struct Message *msg) {
+@@ -399,12 +401,14 @@ static void handleKick(struct Message *msg) {
  		hash(msg->user), msg->nick,
  		completeColor(id, msg->params[1]), msg->params[1],
  		hash(msg->params[0]), msg->params[0],
@@ -218,7 +218,7 @@ index ddf43e8..7b3c096 100644
  	);
  	completeRemove(id, msg->params[1]);
  	if (kicked) completeClear(id);
-@@ -457,13 +461,15 @@ static void handleQuit(struct Message *msg) {
+@@ -455,13 +459,15 @@ static void handleQuit(struct Message *msg) {
  			id, heat, tagTime(msg),
  			"\3%02d%s\3\tleaves%s%s",
  			hash(msg->user), msg->nick,
@@ -236,7 +236,7 @@ index ddf43e8..7b3c096 100644
  		);
  	}
  	completeRemove(None, msg->nick);
-@@ -698,7 +704,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
+@@ -696,7 +702,7 @@ static void handleReplyUserModeIs(struct Message *msg) {
  	for (char *ch = msg->params[1]; *ch; ++ch) {
  		if (*ch == '+') continue;
  		const char *name = UserModes[(byte)*ch];
@@ -245,7 +245,7 @@ index ddf43e8..7b3c096 100644
  	}
  	uiFormat(
  		Network, Warm, tagTime(msg),
-@@ -737,13 +743,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
+@@ -735,13 +741,13 @@ static void handleReplyChannelModeIs(struct Message *msg) {
  			assert(param < ParamCap);
  			catf(
  				&cat, ", +%c%s%s %s",
@@ -261,7 +261,7 @@ index ddf43e8..7b3c096 100644
  			);
  		}
  	}
-@@ -770,7 +776,7 @@ static void handleMode(struct Message *msg) {
+@@ -768,7 +774,7 @@ static void handleMode(struct Message *msg) {
  				hash(msg->user), msg->nick,
  				(set ? "" : "un"),
  				self.color, msg->params[0],
@@ -270,16 +270,16 @@ index ddf43e8..7b3c096 100644
  			);
  		}
  		return;
-@@ -927,7 +933,7 @@ static void handleErrorBanListFull(struct Message *msg) {
+@@ -925,7 +931,7 @@ static void handleErrorBanListFull(struct Message *msg) {
  	require(msg, false, 4);
  	uiFormat(
- 		idFor(msg->params[1]), Cold, tagTime(msg),
+ 		idFor(msg->params[1]), Warm, tagTime(msg),
 -		"%s", (msg->params[4] ?: msg->params[3])
 +		"%s", (msg->params[4] ? msg->params[4] : msg->params[3])
  	);
  }
  
-@@ -1032,14 +1038,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
+@@ -1030,14 +1036,15 @@ static void handleReplyWhoisIdle(struct Message *msg) {
  		}
  	}
  	char signon[sizeof("0000-00-00 00:00:00")];
@@ -297,7 +297,7 @@ index ddf43e8..7b3c096 100644
  	);
  }
  
-@@ -1070,7 +1077,9 @@ static void handleReplyWhoisGeneric(struct Message *msg) {
+@@ -1068,7 +1075,9 @@ static void handleReplyWhoisGeneric(struct Message *msg) {
  		Network, Warm, tagTime(msg),
  		"\3%02d%s\3\t%s%s%s",
  		completeColor(Network, msg->params[1]), msg->params[1],
@@ -308,7 +308,7 @@ index ddf43e8..7b3c096 100644
  	);
  }
  
-@@ -1137,7 +1146,7 @@ static bool isMention(const struct Message *msg) {
+@@ -1135,7 +1144,7 @@ static bool isMention(const struct Message *msg) {
  	const char *match = msg->params[1];
  	while (NULL != (match = strstr(match, self.nick))) {
  		char a = (match > msg->params[1] ? match[-1] : ' ');
@@ -318,20 +318,29 @@ index ddf43e8..7b3c096 100644
  			return true;
  		}
 diff --git a/ui.c b/ui.c
-index e3fd467..ace94bc 100644
+index 557d0dc..91a6993 100644
 --- a/ui.c
 +++ b/ui.c
-@@ -842,7 +842,6 @@ static void keyCode(int code) {
- 		break; case KeyMetaGt: windowScroll(window, -BufferCap);
- 		break; case KeyMetaLt: windowScroll(window, +BufferCap);
+@@ -470,7 +470,7 @@ static size_t windowTop(const struct Window *window) {
+ }
+ 
+ static size_t windowBottom(const struct Window *window) {
+-	size_t bottom = BufferCap - (window->scroll ?: 1);
++	size_t bottom = BufferCap - (window->scroll ? window->scroll : 1);
+ 	if (window->scroll) bottom -= SplitLines + MarkerLines;
+ 	return bottom;
+ }
+@@ -920,7 +920,6 @@ static void keyCode(int code) {
+ 		break; case KeyMetaGt: scrollTo(window, 0);
+ 		break; case KeyMetaLt: scrollTop(window);
  
 -		break; case KeyMeta0 ... KeyMeta9: uiShowNum(code - KeyMeta0);
  		break; case KeyMetaA: showAuto();
  		break; case KeyMetaB: edit(id, EditPrevWord, 0);
  		break; case KeyMetaD: edit(id, EditDeleteNextWord, 0);
-@@ -868,6 +867,12 @@ static void keyCode(int code) {
- 		break; case KEY_SEND: windowScroll(window, -BufferCap);
- 		break; case KEY_SHOME: windowScroll(window, +BufferCap);
+@@ -947,6 +946,12 @@ static void keyCode(int code) {
+ 		break; case KEY_SEND: scrollTo(window, 0);
+ 		break; case KEY_SHOME: scrollTo(window, BufferCap);
  		break; case KEY_UP: windowScroll(window, +1);
 +
 +		break; default: {
diff --git a/pkg/catgirl/ver b/pkg/catgirl/ver
@@ -1 +1 @@
-1.5 r0
+1.6 r0