X-Git-Url: https://projects.mako.cc/source/muttjump/blobdiff_plain/7ee3d9bac7902c2dd763dc7acf1a1113c2f2f0d6..9894dca2c4a6c6658d2f7516ee1e2f6d33608b57:/muttjump?ds=inline
diff --git a/muttjump b/muttjump
index 38e8a02..db2f3ad 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
@@ -43,6 +42,10 @@ if ! type MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE >/dev/null 2>&1 ; then
}
fi
+# Version of GNU screen
+# Since 4.01.00devel (commit d87a0d8) backslash handling was altered.
+MUTTJUMP_SCREEN_VERSION=${MUTTJUMP_SCREEN_VERSION:-auto}
+
# program paths
MUTT=${MUTT:-mutt}
MAIRIX=${MAIRIX:-mairix}
@@ -75,6 +78,14 @@ function wc_L () {
awk '{ y = length(); if (y > x) x = y } END { print x }'
}
+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 <$//')
# try to locate path of message using a mail search engine
case $MUTTJUMP_INDEXER in
mairix)
+ msgid_mairix=$msgid_clean
# mairix can't quote special characters (~,/=^) in search words. As a
# workaround, split Message-ID in 31-character long AND-linked
# substrings.
- msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
- -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ \+$/=/g' \
- -e 's/ /=,/g')
+ if echo "$msgid_clean" | grep -q '[~,/=^]' ; then
+ msgid_mairix=$(echo "$msgid_clean" | sed -e 's/[~,/=^]\+/ /g' \
+ -e 's/[^ ]\{31\}/& /g' -e 's/^ \+//g' -e 's/ *$/=/g' \
+ -e 's/ /=,/g')
+ fi
orig_msgfiles=$($MAIRIX -r "m:$msgid_mairix")
;;
mu)
@@ -213,43 +227,43 @@ fi
msgid_mutt=$(quote_regexp "$msgid_quoted")
jump_expr="~i'$msgid_mutt'"
+jump_cmd="$jump_expr"
+if [ "$MUTTJUMP_MODE" = search ] ; then
+ jump_cmd="$jump_cmdall"
+fi
-if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
-
- jump_cmd="$jump_expr"
- if [ "$MUTTJUMP_MODE" = search ] ; then
- jump_cmd="$jump_cmdall"
- 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")
- 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\""