From 6435dfdda5c50b0244260d881210538c81d43fa0 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Mon, 8 Mar 2021 10:47:18 -0500 Subject: Disable nick and channel colors with hash bound 0 --- catgirl.1 | 7 +++++-- chat.c | 1 - chat.h | 1 + 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) { -- cgit 1.4.1