Merge remote-tracking branch 'krobelus/tmux'

This commit is contained in:
Maxime Coste 2023-03-13 21:33:31 +11:00
commit 58ead47fb4
2 changed files with 18 additions and 11 deletions

View File

@ -17,9 +17,15 @@ define-command -hidden -params 1.. tmux-repl-impl %{
exit exit
fi fi
tmux_args="$1" tmux_args="$1"
if [ "${1%%-*}" = split ]; then
tmux_args="$tmux_args -t ${kak_client_env_TMUX_PANE}"
elif [ "${1%% *}" = new-window ]; then
session_id=$(tmux display-message -p -t ${kak_client_env_TMUX_PANE} '#{session_id}')
tmux_args="$tmux_args -t $session_id"
fi
shift shift
tmux $tmux_args "$@" repl_pane_id=$(tmux $tmux_args -P -F '#{pane_id}' "$@")
printf "set-option current tmux_repl_id '%s'" $(tmux display-message -p '#{session_id}:#{window_id}.#{pane_id}') printf "set-option current tmux_repl_id '%s'" "$repl_pane_id"
} }
} }
@ -50,17 +56,14 @@ define-command -params 0..1 tmux-repl-set-pane -docstring %{
exit exit
fi fi
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
curr_pane="$(tmux display-message -p '#{pane_id}')" curr_pane_no="${kak_client_env_TMUX_PANE#%}"
curr_pane_no="${curr_pane:1}"
tgt_pane=$((curr_pane_no+1)) tgt_pane=$((curr_pane_no+1))
else else
tgt_pane="$1" tgt_pane="$1"
fi fi
curr_win="$(tmux display-message -p '#{window_id}')" curr_win="$(tmux display-message -t ${kak_client_env_TMUX_PANE} -p '#{window_id}')"
curr_win_no="${curr_win:1}" if tmux list-panes -t "$curr_win" -F \#D | grep -Fxq "%"$tgt_pane; then
current=$(tmux list-panes -t $curr_win_no -F \#D) printf "set-option current tmux_repl_id '%s'" %$tgt_pane
if [[ "$current" =~ "%"$tgt_pane ]]; then
printf "set-option current tmux_repl_id '%s'" $(tmux display-message -p '#{session_id}:#{window_id}.')%$tgt_pane
else else
echo 'fail The correct pane is not there. Activate using tmux-terminal-* or some other way' echo 'fail The correct pane is not there. Activate using tmux-terminal-* or some other way'
fi fi
@ -71,13 +74,14 @@ define-command -hidden tmux-send-text -params 0..1 -docstring %{
tmux-send-text [text]: Send text to the REPL pane. tmux-send-text [text]: Send text to the REPL pane.
If no text is passed, then the selection is used If no text is passed, then the selection is used
} %{ } %{
nop %sh{ evaluate-commands %sh{
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
tmux set-buffer -b kak_selection -- "${kak_selection}" tmux set-buffer -b kak_selection -- "${kak_selection}"
else else
tmux set-buffer -b kak_selection -- "$1" tmux set-buffer -b kak_selection -- "$1"
fi fi
tmux paste-buffer -b kak_selection -t "$kak_opt_tmux_repl_id" tmux paste-buffer -b kak_selection -t "$kak_opt_tmux_repl_id" ||
echo 'fail tmux-send-text: failed to send text, see *debug* buffer for details'
} }
} }

View File

@ -18,6 +18,9 @@ define-command -hidden -params 2.. tmux-terminal-impl %{
tmux_args="$1" tmux_args="$1"
if [ "${1%%-*}" = split ]; then if [ "${1%%-*}" = split ]; then
tmux_args="$tmux_args -t ${kak_client_env_TMUX_PANE}" tmux_args="$tmux_args -t ${kak_client_env_TMUX_PANE}"
elif [ "${1%% *}" = new-window ]; then
session_id=$(tmux display-message -p -t ${kak_client_env_TMUX_PANE} '#{session_id}')
tmux_args="$tmux_args -t $session_id"
fi fi
shift shift
# ideally we should escape single ';' to stop tmux from interpreting it as a new command # ideally we should escape single ';' to stop tmux from interpreting it as a new command