automatically open windows in MUTTJUMP_MULTI_SCREEN_MODE

requires git version of GNU screen

diff --git a/muttjump b/muttjump
index 4a1fd9324e32d400d5a37d7aab463cfa0382512b..60da9408d1c5d49d1923251cb16d78f1dd2d287e 100755 (executable)
--- a/muttjump
+++ b/muttjump
@@ -186,14 +186,13 @@ if [ ! -d "$orig_maildir/cur" ] ; then
 fi
 
 jump_expr="~i'$msgid'"
 fi
 
 jump_expr="~i'$msgid'"

+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
 
 
 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_USE_SCREEN" = auto -a -n "$STY" ] ; then
         MUTTJUMP_USE_SCREEN=yes
     fi


@@ -217,12 +216,22 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then
 
 else
 
 
 else
 

-    jump_cmd="l$jump_expr\r"
+    jump_cmd_short="l$jump_expr\r"

     if [ "$MUTTJUMP_MODE" = search ] ; then
     if [ "$MUTTJUMP_MODE" = search ] ; then

-        jump_cmd="${jump_cmd}lall\r"
+        jump_cmd_short="${jump_cmd_short}lall\r"

     fi
 
     screen_window_name=$(MUTTJUMP_SCREEN_WINDOW_NAME_MANGLE "$orig_maildir")
 
     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\""
+    if [ -z "$STY" ] ; then
+        reopen_tty
+        $SCREEN -t "$screen_window_name" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+    else
+        $SCREEN -X -p "$screen_window_name" -Q select "$screen_window_name" >/dev/null
+        if [ $? != 0 ] ; then
+            $SCREEN -X screen -t "$screen_window_name" $MUTT -f "$orig_maildir" -e "push \"$jump_cmd\""
+        else
+            $SCREEN -X -p "$screen_window_name" stuff "$jump_cmd_short"
+        fi
+    fi

 fi
 fi