Anonymous avatar Anonymous committed eeb198e

handle -!- notices more like normal nicks

Comments (0)

Files changed (1)

extras/cw_color.sh

 
 # to find out which colors are readable...
 # for i in {0..255}; do echo $(tput setaf $i) $i foobar baz qux; done
-colors=({9..14} {26..51} {62..87} {99..123} {130..159} {165..231})
+colors=({9..11} {13..14} {26..51} {62..87} {99..123} {130..159} {165..231})
 declare -A color_cache
 
 reset="$(tput sgr0)"
 bold="$(tput bold)"
 black="$(tput setaf 0)"
 red="$(tput setaf 9)"
-cyan="$(tput setaf 6)"
-magenta="$(tput setaf 5)"
-green="$(tput setaf 2)"
-yellow="$(tput setaf 3)"
+cyan="$(tput setaf 14)"
+magenta="$(tput setaf 13)"
+green="$(tput setaf 10)"
+yellow="$(tput setaf 11)"
 
 action="$magenta*$cyan*$yellow*"
+notice_fmt="$black$bold"
 my_nick_fmt="$red$(echo -e "\a")"
 my_line_fmt="$cyan"
 
 done
 
 set_format() {
-	if [ "$*" = "$NICK" ]; then
+	if [ "$*" = "-!-" ]; then
+		format="$notice_fmt"
+	elif [ "$*" = "$NICK" ]; then
 		format="$my_line_fmt"
 	elif [ -n "${color_cache["$*"]}" ]; then
 		format=${color_cache["$*"]}
 
 	time="${bold}${black}${time}${reset}"
 
-	if [ "$nick" = "-!-" ]; then
-		format="${bold}${black}"
-		nick=$(printf "%s%$((PAD + 3))s" "$format" "$nick")
-	else
-		set_format "$nick"
-		nick=$(printf "%s%${PAD}s%s |%s" "$format" "$nick" "$reset" "$format")
-	fi
+	set_format "$nick"
+	nick=$(printf "%s%${PAD}s%s |%s" "$format" "$nick" "$reset" "$format")
 
 	first=1
 	echo "$msg" | fmt -w $((cols - head_len - 1)) -s |
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.