From: Johannes Weißl Date: Tue, 9 Nov 2010 13:37:31 +0000 (+0100) Subject: add screen mode (idea by jostber ) X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/46afe24c0022bfb3218949426d6be6a26bb495ec?ds=sidebyside add screen mode (idea by jostber ) To use it, set the following variables: export MUTTJUMP_USE_SCREEN=yes export MUTTJUMP_SCREEN_SESSION=foobar start mutt inside screen session: screen -S foobar -t Sent mutt -f =Sent screen -X -S foobar eval "screen -t INBOX mutt -f =INBOX" (optionally start more mutt instances) screen window names are generated from the mailbox path using the function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE(mbox_path), which defaults to basename(mbox_path). --- diff --git a/muttjump b/muttjump index 8376fa0..25720f4 100755 --- a/muttjump +++ b/muttjump @@ -21,11 +21,31 @@ # one of: mairix, mu, mu-old (mu < 0.7) and nmzmail MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-} +# "limit" or "search" (default) +MUTTJUMP_MODE=${MUTTJUMP_MODE:-search} + +# "yes" or "no" +# If this is set to "yes", muttjump will not open a new instance of +# mutt, but instead jump to the original message in a running mutt +# (which is running in a screen session). +MUTTJUMP_USE_SCREEN=${MUTTJUMP_USE_SCREEN:-no} + +# name of the screen session (screen -S ...), leave blank for none +MUTTJUMP_SCREEN_SESSION=${MUTTJUMP_SCREEN_SESSION:-} + +# function to create the screen window name from the full path of the mailbox +if ! type -p MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null ; then + function MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE () { + basename "$1" + } +fi + # program paths MUTT=${MUTT:-mutt} MAIRIX=${MAIRIX:-mairix} MU=${MU:-mu} NMZMAIL=${NMZMAIL:-nmzmail} +SCREEN=${SCREEN:-screen} function die () { echo -e >&2 "$0: $1" @@ -93,12 +113,32 @@ if [ ! -d "$orig_maildir/cur" ] ; then die "directory \"$orig_maildir\" doesn't exist or is no Maildir" fi -# Close message-stdin and open terminal-stdin instead. -# mutt behaves different if STDIN is no terminal -# TODO: Find cleaner solution (e.g. mutt command-line argument?) -exec 0<&- -term="/dev/$(ps -p$$ --no-heading | awk '{print $2}')" -exec < $term +jump_cmd="$orig_maildir<$MUTTJUMP_MODE>~i $msgid" + +if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then -# start mutt, open original folder and jump to the original message -$MUTT -e "push $orig_maildir\"~i $msgid\"" + # Close message-stdin and open terminal-stdin instead. + # mutt behaves different if STDIN is no terminal + # TODO: Find cleaner solution (e.g. mutt command-line argument?) + exec 0<&- + term="/dev/$(ps -p$$ --no-heading | awk '{print $2}')" + exec < $term + + # start mutt, open original folder and jump to the original message + $MUTT -e "push \"$jump_cmd\"" + +else + + screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir") + screen_opts="" + if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then + screen_opts="-S $MUTTJUMP_SCREEN_SESSION" + fi + + $SCREEN $screen_opts -X eval "select $screen_window_name" "stuff ':push \"$jump_cmd\" +'" + if [ $? != 0 ] ; then + die "You have to manually start a screen session with: +$SCREEN $screen_opts -t $screen_window_name $MUTT -f \"$orig_maildir\"" + fi +fi