From de6e86da46a93a2d02a8ea24fe6d02f971f2a9e3 Mon Sep 17 00:00:00 2001
From: Tilman List <tilman.list@posteo.de>
Date: Tue, 27 Oct 2020 11:12:09 +0100
Subject: [PATCH 1/4] 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.
---
 rc/windowing/repl/x11.kak | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/rc/windowing/repl/x11.kak b/rc/windowing/repl/x11.kak
index 26dcd264..5f1cb770 100644
--- a/rc/windowing/repl/x11.kak
+++ b/rc/windowing/repl/x11.kak
@@ -4,6 +4,8 @@ hook global ModuleLoaded x11 %{
 
 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
 define-command -docstring %{
     x11-repl [<arguments>]: create a new window for repl interaction
@@ -17,16 +19,19 @@ define-command -docstring %{
            exit
         fi
         if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi
-        # The escape sequence in the printf command sets the terminal's title:
-        setsid ${kak_opt_termcmd} "printf '\e]2;kak_repl_window\a' \
-                && ${cmd}" < /dev/null > /dev/null 2>&1 &
+        # 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" %{
     evaluate-commands %sh{
         printf %s\\n "${kak_selection}" | xsel -i ||
         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'
     }
 }

From a5dbeeb5eea693a5d384652693d1359b1e481c25 Mon Sep 17 00:00:00 2001
From: Tilman List <tilman.list@posteo.de>
Date: Tue, 27 Oct 2020 22:57:04 +0100
Subject: [PATCH 3/4] simplify x11-repl by using x11-terminal

---
 rc/windowing/repl/x11.kak | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/rc/windowing/repl/x11.kak b/rc/windowing/repl/x11.kak
index 5f1cb770..a9256611 100644
--- a/rc/windowing/repl/x11.kak
+++ b/rc/windowing/repl/x11.kak
@@ -6,26 +6,19 @@ 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
 define-command -docstring %{
     x11-repl [<arguments>]: create a new window for repl interaction
     All optional parameters are forwarded to the new window
 } \
     -params .. \
     -shell-completion \
-    x11-repl %{ evaluate-commands %sh{
-        if [ -z "${kak_opt_termcmd}" ]; then
-           echo 'fail termcmd option is not set'
-           exit
-        fi
-        if [ $# -eq 0 ]; then cmd="${SHELL:-sh}"; else cmd="$@"; fi
-        # 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 &
-}}
+    x11-repl %{ x11-terminal sh -c %{
+        printf "evaluate-commands -try-client $1 \
+            'set-option current x11_repl_id ${WINDOWID}'" | kak -p "$2"
+        shift 2;
+        [ "$1" ] && "$@" || "$SHELL"
+    } -- %val{client} %val{session} %arg{@}
+}
 
 define-command x11-send-text -docstring "send the selected text to the repl window" %{
     evaluate-commands %sh{

From d545d2c181866edf7070064209c0840df6ef0f45 Mon Sep 17 00:00:00 2001
From: Tilman List <tilman.list@posteo.de>
Date: Fri, 30 Oct 2020 14:35:20 +0100
Subject: [PATCH 4/4] if the $WINDOWID is not set, use xdotool to get the
 window id

---
 rc/windowing/repl/x11.kak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rc/windowing/repl/x11.kak b/rc/windowing/repl/x11.kak
index a9256611..d7e6ed21 100644
--- a/rc/windowing/repl/x11.kak
+++ b/rc/windowing/repl/x11.kak
@@ -13,8 +13,9 @@ define-command -docstring %{
     -params .. \
     -shell-completion \
     x11-repl %{ x11-terminal sh -c %{
+        winid="${WINDOWID:-$(xdotool search --pid ${PPID} | tail -1)}"
         printf "evaluate-commands -try-client $1 \
-            'set-option current x11_repl_id ${WINDOWID}'" | kak -p "$2"
+            'set-option current x11_repl_id ${winid}'" | kak -p "$2"
         shift 2;
         [ "$1" ] && "$@" || "$SHELL"
     } -- %val{client} %val{session} %arg{@}