Anonymous avatar Anonymous committed 0684a96

change cw_color.sh to work better with default ii, update config.def.h to use both > and | for margin so wrapping works with default ii

Comments (0)

Files changed (2)

  *
  * If you want the lines to wrap back to the end of the nicks instead of all
  * the way to the beginning of the terminal try one of these. Read the man page
- * to understand the margin argument, but in short it should be ">!" for default
- * ii and "|!" with the emg patch
- * char *cmd[] = { "urxvt", "-title", path, "-e", "srw", "-p", prompt, "cw_color.sh", "-i", out, "-o", in, "-m", ">!", "-n", nick, NULL };
- * char *cmd[] = { "urxvt", "-title", path, "-e", "srw", "-p", prompt, "cw_color.sh", "-i", out, "-o", in, "-m", "|!", "-n", nick, NULL };
- * char *cmd[] = { "urxvt", "-title", path, "-e", "srw", "-p", prompt, "cw", out, in, ">!", NULL };
- * char *cmd[] = { "urxvt", "-title", path, "-e", "srw", "-p", prompt, "cw", out, in, "|!", NULL };
+ * to understand the margin argument, these are set up to work with both stock
+ * ii and the emg patch
+ * char *cmd[] = { "urxvt", "-title", path, "-e", "srw", "-p", prompt, "cw_color.sh", "-i", out, "-o", in, "-m", "|>!", "-n", nick, NULL };
+ * char *cmd[] = { "urxvt", "-title", path, "-e", "srw", "-p", prompt, "cw", out, in, "|>!", NULL };
  *
  * Use this if you want to use tabbed (http://tools.suckless.org/tabbed) so
  * that each new channel is it's own tab. Start tabbed with -d, then export the

extras/cw_color.sh

 bg_white="$(tput setab 7)"
 
 NICK="$USER"
-MARGIN=">!"
+MARGIN='>|!'
 
 while [ $# -gt 0 ]; do
 	case $1 in
 
 cw "$IN" "$OUT" "$MARGIN" |
 	sed \
-		-e "s/^\([-0-9]\{10,10\}\) \([:0-9]\{5,5\}\)\( *-!-\)/${yellow}\1 ${green}\2${reset}${magenta}\3${reset}/" \
-		-e "s/^\([-0-9]\{10,10\}\) \([:0-9]\{5,5\}\) <\?\( *[^ $MARGIN]* \?\)\([$MARGIN]\)/${yellow}\1 ${green}\2${reset} ${cyan}\3${reset}\4/" \
+		-e "s/^ *!/${magenta}& ${reset}/" \
+		-e "s/^\([-0-9]\{10,10\}\) \([:0-9]\{5,5\}\)\( *-\?!-\?\)/${yellow}\1 ${green}\2${reset}${magenta}\3${reset}/" \
+		-e "s/^\([-0-9]\{10,10\}\) \([:0-9]\{5,5\}\)\( *<\?\)\( *[^ $MARGIN]* \?\)\([$MARGIN]\)/${yellow}\1 ${green}\2${reset}\3${cyan}\4${reset}\5/" \
 		-e "s/^\([-0-9]\{10,10\}\) \([:0-9]\{5,5\}\)/${yellow}\1 ${green}\2${reset}/" \
 		-e "s/$NICK/\a${red}&${reset}/g" 
 
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.