X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4e7092a3248d55e4af0b45c38a67e3a7998b59a7..fa56bcf3eb3750665d37cb15a3dbff922d706c36:/dot/shell-rc diff --git a/dot/shell-rc b/dot/shell-rc index ea4f575..33403cb 100644 --- a/dot/shell-rc +++ b/dot/shell-rc @@ -92,9 +92,10 @@ esac __mdw_set_prompt_pieces () { ## Fancy highlighting in some terminals. - local bold unbold nl gitcolour rccolour uncolour - local host dir more - bold="" unbold="" nl="" gitcolour="" rccolour="" uncolour="" more="" + local bold unbold nl more host dir + local gitcolour extracolour rccolour uncolour + bold="" unbold="" nl="" more="" + gitcolour="" extracolour="" rccolour="" uncolour="" __mdw_set_prompt_hacks ## Choose the right delimiters. Highlight root prompts specially; @@ -137,6 +138,8 @@ __mdw_set_prompt_pieces () { __mdw_prompt_git_right="$uncolour$bold" __mdw_prompt_rc_left="$unbold$rccolour" __mdw_prompt_rc_right="$uncolour$bold" + __mdw_prompt_extra_left="$unbold$extracolour" + __mdw_prompt_extra_right="$uncolour$bold" __mdw_prompt_right="$right$unbold" __mdw_prompt_more=" $more$bold>$unbold " } @@ -149,7 +152,7 @@ __mdw_set_prompt () { ;; *) __mdw_last_rc=$? - local git rc + local git extra rc if type __git_ps1 >/dev/null 2>&1; then git="$__mdw_prompt_git_left$(__git_ps1)$__mdw_prompt_git_right" else @@ -159,7 +162,11 @@ __mdw_set_prompt () { 0) rc="" ;; *) rc="$__mdw_prompt_rc_left rc=$__mdw_last_rc$__mdw_prompt_rc_right" ;; esac - PS1="$__mdw_prompt_left$git$rc$__mdw_prompt_right" + case $__mdw_prompt_extra in + ?*) extra="$__mdw_prompt_extra_left [$__mdw_prompt_extra]$__mdw_prompt_extra_right" ;; + *) extra="" ;; + esac + PS1="$__mdw_prompt_left$git$extra$rc$__mdw_prompt_right" PS2="$PS1$__mdw_prompt_more" unset __mdw_last_rc ;; @@ -168,7 +175,7 @@ __mdw_set_prompt () { __mdw_xterm_settitle () { printf >/dev/tty \ - "]2;%s@%s:%s – %s\\" \ + "]0;%s@%s:%s – %s\\" \ "$__mdw_user" "$__mdw_host$__mdw_hqual" "$PWD" \ "$1" } @@ -226,6 +233,10 @@ alias clisp="clisp -q -q" alias cmucl="rlwrap cmucl -quiet" alias ecl="rlwrap ecl" alias sbcl="rlwrap sbcl --noinform" +alias ccl="rlwrap ccl" +alias ccl32="rlwrap ccl32" +alias ccl64="rlwrap ccl64" +alias abcl="rlwrap abcl --noinform" ###-------------------------------------------------------------------------- ### Colour output. @@ -462,6 +473,13 @@ case $(id -u) in ;; esac +## Install wakeup machinery for long-running programs. +case ${DISPLAY+t},${WINDOWID+t},${__mdw_precmd_hook+t},${__mdw_preexec_hook+t} in + t,t,t,t) + if [ -t 0 ] && __mdw_programp notify-send; then . $HOME/bin/wakey.sh; fi + ;; +esac + ## Run any local hooks. __mdw_source_if_exists "$HOME/.shell-local"