From: Johannes Weißl Date: Fri, 3 Dec 2010 05:10:22 +0000 (+0100) Subject: automatically open windows in MUTTJUMP_MULTI_SCREEN_MODE X-Git-Url: https://projects.mako.cc/source/muttjump/commitdiff_plain/a2cab25a1101edc120297360f5a2d3b173018fb4?hp=6f223392238d65b7156723afed21b71f009cf4ac automatically open windows in MUTTJUMP_MULTI_SCREEN_MODE requires git version of GNU screen --- diff --git a/muttjump b/muttjump index 4a1fd93..60da940 100755 --- a/muttjump +++ b/muttjump @@ -186,14 +186,13 @@ if [ ! -d "$orig_maildir/cur" ] ; then fi jump_expr="~i'$msgid'" +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 @@ -217,12 +216,22 @@ if [ "$MUTTJUMP_MULTI_SCREEN_MODE" = no ] ; then else - jump_cmd="l$jump_expr " + jump_cmd_short="l$jump_expr " if [ "$MUTTJUMP_MODE" = search ] ; then - jump_cmd="${jump_cmd}lall " + jump_cmd_short="${jump_cmd_short}lall " 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