changed the way the x11 REPL interaction works

Now it uses the window id to identify the REPL window. It is stored in
the option x11_repl_id. That way it is possible to have different REPLs
for different buffers or windows.
This commit is contained in:
Tilman List 2020-10-27 11:12:09 +01:00
parent 9a5cf2fc9f
commit de6e86da46

View File

@ -4,6 +4,8 @@ hook global ModuleLoaded x11 %{
provide-module x11-repl %{ provide-module x11-repl %{
declare-option -docstring "window id of the REPL window" str x11_repl_id
# termcmd should already be set in x11.kak # 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
@ -17,16 +19,19 @@ define-command -docstring %{
exit exit
fi fi
if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi
# The escape sequence in the printf command sets the terminal's title: # put the window id of the REPL into the option x11_repl_id
setsid ${kak_opt_termcmd} "printf '\e]2;kak_repl_window\a' \ wincmd=$(printf 'printf "evaluate-commands -try-client %s \
&& ${cmd}" < /dev/null > /dev/null 2>&1 & 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{
printf %s\\n "${kak_selection}" | xsel -i || printf %s\\n "${kak_selection}" | xsel -i ||
echo 'fail x11-send-text: failed to run xsel, see *debug* buffer for details' && echo 'fail x11-send-text: failed to run xsel, see *debug* buffer for details' &&
xdotool search --name kak_repl_window key --clearmodifiers Shift+Insert || xdotool windowactivate "${kak_opt_x11_repl_id}" key --clearmodifiers Shift+Insert ||
echo 'fail x11-send-text: failed to run xdotool, see *debug* buffer for details' echo 'fail x11-send-text: failed to run xdotool, see *debug* buffer for details'
} }
} }