X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/64ae6e09ed6c57660c921d7f1bdd5e1aa4ad9886..fbad77933cca088c24bda6321f95cef5dd081617:/muttjump

diff --git a/muttjump b/muttjump
index 7ebc639..50ca34a 100755
--- a/muttjump
+++ b/muttjump
@@ -24,11 +24,17 @@ MUTTJUMP_INDEXER=${MUTTJUMP_INDEXER:-}
 # "limit" or "search" (default)
 MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
 
+# "yes", "no" or "auto"
+# If set to "auto", the $STY environment variable is used for auto detection.
+MUTTJUMP_USE_SCREEN="auto"
+
 # "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}
+# ATTENTION: You need to have one mutt instance open for every mailbox
+#            for this to work!
+MUTTJUMP_MULTI_SCREEN_MODE=${MUTTJUMP_MULTI_SCREEN_MODE:-no}
 
 # name of the screen session (screen -S ...), leave blank for none
 MUTTJUMP_SCREEN_SESSION=${MUTTJUMP_SCREEN_SESSION:-}
@@ -58,6 +64,10 @@ function quote () {
     echo \'${1//\'/\'\\\'\'}\'
 }
 
+function is_callable () {
+    type -p $1 >/dev/null
+}
+
 # Check command-line arguments and STDIN
 if tty -s || [ $# -ne 0 ] ; then
     cat >&2 <<END
@@ -71,7 +81,7 @@ END
 fi
 
 # check if mutt is installed
-if ! type -p $MUTT >/dev/null ; then
+if ! is_callable $MUTT ; then
     die "$MUTT is not in PATH, set MUTT variable"
 fi
 
@@ -84,9 +94,9 @@ case $MUTTJUMP_MODE in
 esac
 
 # search for Message-ID in STDIN
-if type -p $FORMAIL >/dev/null ; then
+if is_callable $FORMAIL ; then
     msgid=$($FORMAIL -c -z -x Message-ID | head -n1)
-elif type -p $REFORMAIL >/dev/null ; then
+elif is_callable $REFORMAIL ; then
     msgid=$($REFORMAIL -c -x Message-ID: | head -n1)
 else
     msgid=$(sed -n 's/^Message-ID:[ \t]*\(.*\)/\1/Ip' | head -n1)
@@ -135,22 +145,34 @@ fi
 
 jump_expr="~i'$msgid'"
 
-if [ "$MUTTJUMP_USE_SCREEN" = no ] ; then
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
     jump_cmd="<limit>$jump_expr<enter>"
     if [ "$MUTTJUMP_MODE" = search ] ; then
         jump_cmd="$jump_cmd<limit>all<enter>"
     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$$ -otty=)"
-    exec < $term
+    if [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
+        MUTTJUMP_USE_SCREEN=yes
+    fi
+
+    screen_opts=()
+    if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
+        [ -n "$STY" ] && screen_opts=("-X" "screen")
+        screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
+        screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
+    else
+        SCREEN=""
+        # 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$$ -otty=)"
+        exec < $term
+    fi
 
     # start mutt, open original folder and jump to the original message
-    $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+    $SCREEN "${screen_opts[@]}" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
 
 else
 
@@ -160,7 +182,7 @@ else
     fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-    declare -a screen_opts
+    screen_opts=()
     if [ -n "$MUTTJUMP_SCREEN_SESSION" ] ; then
         screen_opts=("-S" "$MUTTJUMP_SCREEN_SESSION")
         screen_opts_str="-S $(quote "$MUTTJUMP_SCREEN_SESSION")"