X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/22c083dee541010933c292439b821ffafa4133ec..85b54fd20a7b1b98a5628cede99216c596ca80eb:/muttjump

diff --git a/muttjump b/muttjump
index 6f5a1d3..73c6bc1 100755
--- a/muttjump
+++ b/muttjump
@@ -29,11 +29,10 @@ MUTTJUMP_MODE=${MUTTJUMP_MODE:-search}
 MUTTJUMP_USE_SCREEN=${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).
-# ATTENTION: You need to have one mutt instance open for every mailbox
-#            for this to work!
+# Set this to "yes" if you want exactly one screen window (with mutt running
+# inside) per mailbox. With new versions of screen (> 4.00) it is possible
+# to do that automatically, with old versions you have to start them
+# manually! Setting this to yes implies MUTTJUMP_USE_SCREEN=yes.
 MUTTJUMP_MULTI_SCREEN_MODE=${MUTTJUMP_MULTI_SCREEN_MODE:-no}
 
 # function to create the screen window name from the full path of the mailbox
@@ -44,7 +43,7 @@ if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
 fi
 
 # Version of GNU screen
-# Since 4.01.00 (commit d87a0d8) backslash handling was altered.
+# Since 4.01.00devel (commit 98b6b41) backslash for -X handling was altered.
 MUTTJUMP_SCREEN_VERSION=${MUTTJUMP_SCREEN_VERSION:-auto}
 
 # program paths
@@ -79,6 +78,18 @@ function wc_L () {
     awk '{ y = length(); if (y > x) x = y } END { print x }'
 }
 
+# Check if screen is new enough to parse -X (commit 98b6b41) and support
+# -Q (commit 8147d08). It (falsely) assumes that screen version > 4.00
+# does this. Distributions that use git versions are likely to also keep
+# them up to date.
+function is_new_screen () {
+    sv=$MUTTJUMP_SCREEN_VERSION
+    if [ "$sv" = auto ] ; then
+        sv=$($SCREEN --version | awk '{print $3}')
+    fi
+    echo "$sv" | grep -vq "^\(4\.00\|[0-3]\.\)"
+}
+
 function usage () {
     cat >&2 <<END
 Usage: muttjump msgid
@@ -220,50 +231,43 @@ fi
 
 msgid_mutt=$(quote_regexp "$msgid_quoted")
 jump_expr="~i'$msgid_mutt'"
+jump_cmd="<limit>$jump_expr<enter>"
+if [ "$MUTTJUMP_MODE" = search ] ; then
+    jump_cmd="$jump_cmd<limit>all<enter>"
+fi
 
-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
-
-    if [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
-        MUTTJUMP_USE_SCREEN=yes
-    fi
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = yes ] ||
+        [ "$MUTTJUMP_USE_SCREEN" = auto -a -n "$STY" ] ; then
+    MUTTJUMP_USE_SCREEN=yes
+fi
 
-    screen_opts=()
-    if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
-        if [ -n "$STY" ] ; then
-            screen_opts=("-X" "screen")
-            sv=$MUTTJUMP_SCREEN_VERSION
-            if [ "$sv" = auto ] ; then
-                sv=$($SCREEN --version | awk '{print $3}')
-            fi
-            if ! echo "$sv" | grep -q "^\(4\.00\|[0-3]\.\)" ; then
-                jump_cmd=${jump_cmd/\\/\\\\\\}
-            fi
-        else
-            reopen_tty
+screen_opts=()
+screen_query_arg=""
+if [ "$MUTTJUMP_USE_SCREEN" = yes ] ; then
+    if [ -n "$STY" ] ; then
+        screen_opts=("-X" "screen")
+        if is_new_screen ; then
+            jump_cmd=${jump_cmd/\\/\\\\\\}
+            screen_query_arg="-Q"
         fi
-        screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-        screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
     else
-        SCREEN=""
         reopen_tty
     fi
-
-    # start mutt, open original folder and jump to the original message
-    $SCREEN "${screen_opts[@]}" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
-
+    screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
+    screen_opts=("${screen_opts[@]}" "-t" "$screen_window_name")
 else
+    SCREEN=""
+    reopen_tty
+fi
 
-    jump_cmd="l$jump_expr
"
-    if [ "$MUTTJUMP_MODE" = search ] ; then
-        jump_cmd="${jump_cmd}lall
"
+if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = yes -a -n "$STY" ] ; then
+    $SCREEN -X -p "$screen_window_name" $screen_query_arg \
+            select "$screen_window_name" >/dev/null
+    if [ $? = 0 ] ; then
+        $SCREEN -X -p "$screen_window_name" stuff ":push \"$jump_cmd\"
"
+        exit 0
     fi
-
-    screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
-
-    $SCREEN -p "$screen_window_name" -X eval "select '$screen_window_name'" "stuff \"$jump_cmd\""
 fi
+
+# start mutt, open original folder and jump to the original message
+$SCREEN "${screen_opts[@]}" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""