about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-03-08 10:47:18 -0500
committerJune McEnroe <june@causal.agency>2021-03-08 10:47:18 -0500
commit6435dfdda5c50b0244260d881210538c81d43fa0 (patch)
treee86f4c0a2c54a1a11a4f7bd78f1a294e6cb95a25
parentAdd bindings for C-Left and C-Right (diff)
downloadcatgirl-6435dfdda5c50b0244260d881210538c81d43fa0.tar.gz
catgirl-6435dfdda5c50b0244260d881210538c81d43fa0.zip
Disable nick and channel colors with hash bound 0
-rw-r--r--catgirl.17
-rw-r--r--chat.c1
-rw-r--r--chat.h1
3 files changed, 6 insertions, 3 deletions
diff --git a/catgirl.1 b/catgirl.1
index 0543be3..72c0408 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd February 15, 2021
+.Dd March  8, 2021
 .Dt CATGIRL 1
 .Os
 .
@@ -96,12 +96,15 @@ The default is the first available of
 .
 .It Fl H Ar init,bound , Cm hash = Ar init,bound
 Set the initial value of
-the nick color hash function
+the nick and channel
+color hash function
 and the maximum IRC color value used.
 The default is 0,75.
 To use only colors from
 the 16-color terminal set,
 use 0,15.
+To disable nick and channel colors,
+use 0,0.
 .
 .It Fl I Ar pattern , Cm highlight = Ar pattern
 Add a case-insensitive message highlight pattern,
diff --git a/chat.c b/chat.c
index 60ec7d2..7335520 100644
--- a/chat.c
+++ b/chat.c
@@ -123,7 +123,6 @@ uint32_t hashBound = 75;
 static void parseHash(char *str) {
 	hashInit = strtoul(str, &str, 0);
 	if (*str) hashBound = strtoul(&str[1], NULL, 0);
-	if (hashBound < 2) errx(EX_USAGE, "hash bound must be >= 2");
 }
 
 #ifdef __OpenBSD__
diff --git a/chat.h b/chat.h
index 6a21930..8249564 100644
--- a/chat.h
+++ b/chat.h
@@ -139,6 +139,7 @@ static inline uint idFor(const char *name) {
 extern uint32_t hashInit;
 extern uint32_t hashBound;
 static inline enum Color hash(const char *str) {
+	if (hashBound < Blue) return Default;
 	if (*str == '~') str++;
 	uint32_t hash = hashInit;
 	for (; *str; ++str) {
class='logsubject'>Revert "Enable cookies in title"June McEnroe This reverts commit 279111dda15dd9170e11b9688eb973f2af2e6300. 2019-09-20Enable cookies in titleJune McEnroe Perhaps this will make it less suspicious to Google. Who knows. 2019-09-16Use sensitivity aliases in TF2June McEnroe 2019-09-16Add The Just CityJune McEnroe 2019-09-12Only GET the final redirect locationJune McEnroe 2019-09-12Consume entire bodyJune McEnroe Aborting the request and leaving data around may be causing intermittent errors. Just discard the rest of the data. 2019-09-10Add title -v flagJune McEnroe 2019-09-10Use curl error bufferJune McEnroe 2019-09-10Set Accept-Encoding in titleJune McEnroe Because apparently it's fine for servers to respond with Content-Encoding you didn't ask for, and curl won't decode it if you didn't ask for it. 2019-09-08Set title User-AgentJune McEnroe Some things don't like you if you don't send one. 2019-09-07Add -x flag to titleJune McEnroe 2019-09-07Ignore SIGPIPE in relayJune McEnroe Allows restarting consumers safely. 2019-09-07Add A Memory Called EmpireJune McEnroe 2019-09-05Handle lack of Content-TypeJune McEnroe 2019-09-05Use CURLINFO_CONTENT_TYPEJune McEnroe Oops, didn't see this. 2019-09-05Decode entities in titlesJune McEnroe 2019-09-05Print title as soon as it's availableJune McEnroe 2019-09-05Use CURL_PREFIX to set flagsJune McEnroe 2019-09-05Add titleJune McEnroe 2019-09-04Add Avorter n'est pas tuerJune McEnroe 2019-08-29Unset executable on shell scriptsJune McEnroe 2019-08-29Add long-missing setopt to bin.7June McEnroe 2019-08-29Add editJune McEnroe