simplify x11-repl by using x11-terminal

This commit is contained in:
Tilman List 2020-10-27 22:57:04 +01:00
parent a5549f32bf
commit a5dbeeb5ee

View File

@ -6,26 +6,19 @@ provide-module x11-repl %{
declare-option -docstring "window id of the REPL window" str x11_repl_id declare-option -docstring "window id of the REPL window" str x11_repl_id
# termcmd should already be set in x11.kak
define-command -docstring %{ define-command -docstring %{
x11-repl [<arguments>]: create a new window for repl interaction x11-repl [<arguments>]: create a new window for repl interaction
All optional parameters are forwarded to the new window All optional parameters are forwarded to the new window
} \ } \
-params .. \ -params .. \
-shell-completion \ -shell-completion \
x11-repl %{ evaluate-commands %sh{ x11-repl %{ x11-terminal sh -c %{
if [ -z "${kak_opt_termcmd}" ]; then printf "evaluate-commands -try-client $1 \
echo 'fail termcmd option is not set' 'set-option current x11_repl_id ${WINDOWID}'" | kak -p "$2"
exit shift 2;
fi [ "$1" ] && "$@" || "$SHELL"
if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi } -- %val{client} %val{session} %arg{@}
# put the window id of the REPL into the option x11_repl_id }
wincmd=$(printf 'printf "evaluate-commands -try-client %s \
set-option current x11_repl_id ${WINDOWID}" | kak -p %s' \
"${kak_client}" "${kak_session}")
setsid ${kak_opt_termcmd} "${SHELL} -c '${wincmd} && ${cmd}'" \
< /dev/null > /dev/null 2>&1 &
}}
define-command x11-send-text -docstring "send the selected text to the repl window" %{ define-command x11-send-text -docstring "send the selected text to the repl window" %{
evaluate-commands %sh{ evaluate-commands %sh{