Merge branch 'master' of gitosis@majnematic.com:davesdots

Xresources

@@ -88,3 +88,6 @@ URxvt*color12: #729FCF
 URxvt*color13: #AD7FA8
 URxvt*color14: #34E2E2
 URxvt*color15: #EEEEEC
+
+/* Rxvt */
+Rxvt*termName: rxvt

screenrc

@@ -0,0 +1,64 @@
+# Originally by Deason
+# Modified by Majnematic
+
+# turn on visual bell
+vbell on
+
+# default scrollback to 5000 lines
+defscrollback 5000
+
+# turn off visual bell
+termcapinfo * vb@
+
+# see, it's a bell, get it?
+vbell_msg "Ring Ring Ring Ring Ring Ring"
+
+# make screen even more fun
+nethack on
+
+# mess with bold
+attrcolor b ".I"
+
+# get screen to go for 256 colors
+termcapinfo xterm-256color 'Co#256'
+
+# erase background with current bg color
+defbce on
+
+# turn on utf8
+defutf8 on
+
+# set the term to 256 color, maybe
+term "screen${SCREEN_COLOR}-bce"
+
+# changes from the default binding " to `windowlist -b', so we don't create
+# a new empty window
+bind \" windowlist
+
+# includes window title name in activity/bell messages
+activity "Activity in window %n (%t)"
+bell_msg "Bell in window %n (%t)"
+
+# Argh, choosing a hardstatus line is difficult
+# This can only be explained by example, but it takes too much damn space.
+# The screen man page is actually good documentation for this, but it takes
+# a little while to read. Look for "STRING ESCAPES', and that section will
+# explain what all this line noise means.
+#
+# White background, black text, underlined bold current window
+#hardstatus alwayslastline "%{= Wk}%-w%50>%{=ub dd}%n %t%?(%u)%?%{-}%+w%<"
+# Normal text, underlined bold current window
+#hardstatus alwayslastline "%{= dd}%-w%50>%{=ub}%n %t%?(%u)%?%{-}%+w%<"
+# Blue background, white text, underlined bold current window
+hardstatus alwayslastline "%{= bw}%-w%50>%{=ub dd}%n %t%?(%u)%?%{-}%+w%<"
+
+startup_message off
+
+# Show the screen version just for a second
+msgwait 1
+version
+
+# how many seconds a message appears when we don't press any keys
+msgwait 2
+
+altscreen on

vimrc

@@ -131,9 +131,6 @@ if has('eval')
    elseif &t_Co == 256
       set background=light                                     " We use a light background here
       call LoadColorScheme("wombat:inkpot")                    " Set the colorscheme
-   elseif &t_Co == 88
-      set background=dark                                      " We use a dark background here
-      call LoadColorScheme("inkpot:zellner")                   " Set the colorscheme
    else
       set background=dark                                      " We use a dark background here
       call LoadColorScheme("zellner")                          " Set the colorscheme
@@ -274,18 +271,18 @@ imap <silent> <F12> <C-O>:silent set number!<CR>
 " Don't force column 0 for #
 inoremap # X<BS>#
 
-" Force <C-?> to be backspace except when in interix mode
+" Always map <C-h> to backspace
-" because interix uses that for forward delete...
+" Both interix and cons use C-? as forward delete,
-" and always accept <C-h> as a backspace key
+" besides those two exceptions, always set it to backspace
-" Let interix use ^[[U for end and ^[[H for home
+" Also let interix use ^[[U for end and ^[[H for home
 map <C-h> <BS>
 map! <C-h> <BS>
-if (&term !~ "interix")
+if (&term =~ "interix")
-   map  <C-?> <BS>
-   map! <C-?> <BS>
-else
    map  <Home>
    map  <End>
+elseif (&term !~ "cons")
+   map  <C-?> <BS>
+   map! <C-?> <BS>
 endif
 
 " Python specific stuff

zshrc

@@ -68,12 +68,40 @@ elif ( which gdircolors &> /dev/null ) ; then
 fi
 
 # terminal fallback stuff
-if (which infocmp &> /dev/null) ; then
+function fix_term
-	case "${TERM}" in
+{
-		xterm*)
+	case "$1" in
-			( infocmp $TERM &> /dev/null ) || export TERM=xterm
+		xterm|screen)
+			( ( infocmp $1 &> /dev/null ) && echo $1 ) || echo "vt100"
+		;;
+		rxvt|xterm*)
+			( ( infocmp $1 &> /dev/null ) && echo $1 ) || fix_term xterm
+		;;
+		rxvt*)
+			( ( infocmp $1 &> /dev/null ) && echo $1 ) || fix_term rxvt
+		;;
+		screen*)
+			( ( infocmp $1 &> /dev/null ) && echo $1 ) || fix_term screen
+		;;
+		*)
+			( ( infocmp $1 &> /dev/null ) && echo $1 ) || echo "vt100"
 		;;
 	esac
+}
+
+# sorta hacky, but I cannot find a better way to do this :/
+function fix_terminfo_db
+{
+	if [[ `which infocmp` = "$1/bin/infocmp" ]] ; then
+		export TERMINFO="$1/share/terminfo"
+		export TERM=$TERM
+	fi
+}
+
+export TERM=$(fix_term $TERM)
+
+if [[ $TERM == *256* ]] ; then
+	export SCREEN_COLOR="-256color"
 fi
 
 ( which lesspipe &> /dev/null ) && eval $(lesspipe)
@@ -88,19 +116,21 @@ export GIT_PAGER=''
 # aliases
 alias cd..='cd ..'
 
+# handles per OS aliases, fixes a few terms
 case `uname -s` in
 	Linux|CYGWIN*)
 		alias ls="ls -h --color=auto"
 		alias grep='grep -d skip --color=auto'
 	;;
 	FreeBSD|Darwin|DragonFly)
-		# we must lie to the mac, for it is dumb
 		export LSCOLORS=ExGxFxDxCxDxDxHbaDacec
 		alias ls="ls -Gh"
 		alias grep='grep -d skip --color=auto'
 	;;
 	Interix)
 		alias ls="ls --color"
+
+		fix_terminfo_db "/usr/local"
 	;;
 	SunOS)
 		if (which gls &> /dev/null) ; then
@@ -119,11 +149,7 @@ case `uname -s` in
 			alias locate='glocate'
 		fi
 
-		# sorta hacky, but I cannot find a better way to do this :/
+		fix_terminfo_db "/opt/csw"
-		if [[ `which infocmp` = /opt/csw/bin/infocmp ]] ; then
-			export TERMINFO=/opt/csw/share/terminfo
-			export TERM=$TERM
-		fi
 	;;
 esac
 
@@ -171,6 +197,17 @@ case $TERM in
 		bindkey '\e[5D' emacs-backward-word
 		bindkey '\eOC' emacs-forward-word
 		bindkey '\eOD' emacs-backward-word
+		bindkey '\eOc' emacs-forward-word
+		bindkey '\eOd' emacs-backward-word
+		bindkey '\e[c' emacs-forward-word
+		bindkey '\e[d' emacs-backward-word
+	;;
+	screen*)
+		bindkey '\e[1~' beginning-of-line
+		bindkey '\e[4~' end-of-line
+		bindkey '\e[1;5C' emacs-forward-word
+		bindkey '\e[1;5D' emacs-backward-word
+		bindkey '\e[3~' delete-char
 	;;
 	linux)
 		bindkey '\e[1~' beginning-of-line
@@ -186,11 +223,17 @@ case $TERM in
 		bindkey '\e[7~' beginning-of-line
 		bindkey '\e[8~' end-of-line
 	;;
+	cons*)
+		bindkey '\e[H' beginning-of-line
+		bindkey '\e[F' end-of-line
+		bindkey '^?'   delete-char
+	;;
 	interix)
 		bindkey '\e[H' beginning-of-line
 		bindkey '\e[U' end-of-line
+		bindkey '^?'   delete-char
 	;;
-	cygwin)
+	cygwin*)
 		bindkey '\e[1~' beginning-of-line
 		bindkey '\e[4~' end-of-line
 	;;
@@ -210,9 +253,6 @@ precmd()
 {
 	local termtitle
 
-	## Changing IFS breaks a few things otherwise, especially clear-zle-screen
-	IFS=$' \t\n'
-
 	termtitle=$(print -P "%n@%m")
 	title zsh "$termtitle"
 }
@@ -269,7 +309,6 @@ function title
 			# Use these two for GNU Screen:
 			print -nR $'\ek'$1$'\e'"\\"
 			shift
-#			print -nR $'\e]0;'$*$'\a'
 			print -nR $'\e_screen \005 | '$*$'\e'"\\"
 		;;
 		xterm*|rxvt*|cygwin|interix)