From d9a574acd5bfd01aa7217c571bea2832a3aed1be Mon Sep 17 00:00:00 2001 From: Nicholas Ochiel Date: Sat, 23 Sep 2017 17:26:57 +0300 Subject: [PATCH 1/2] Integration with GNU screen; based on tmux.kak - Hack: kak sets `/proc/self/fd/0 -> /dev/null`. Get the client process tty because Screen needs to know the controlling terminal. Else Screen will use the last known tty and will open new windows on a different terminal if one is connected. --- rc/base/screen.kak | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rc/base/screen.kak diff --git a/rc/base/screen.kak b/rc/base/screen.kak new file mode 100644 index 00000000..b60fbd1e --- /dev/null +++ b/rc/base/screen.kak @@ -0,0 +1,50 @@ +# http://gnu.org/software/screen/ +# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ + +hook global KakBegin .* %{ + %sh{ + [ -z "kak_client_env_$STY" ] && exit + echo " + alias global focus screen-focus + alias global new screen-new-vertical + " + } +} + + +def screen-new-vertical -params .. -command-completion -docstring "Create a new vertical region" %{ + %sh{ + + tty="$(ps -o tty ${kak_client_pid} | tail -n 1)" + screen -X eval 'split -h' 'focus down' "screen kak -c \"${kak_session}\" -e \"$*\"" < "/dev/$tty" + } +} + +def screen-new-horizontal -params .. -command-completion -docstring "Create a new horizontal region" %{ + %sh{ + tty="$(ps -o tty ${kak_client_pid} | tail -n 1)" + screen -X eval 'split -v' 'focus right' "screen kak -c \"${kak_session}\" -e \"$*\"" < "/dev/$tty" + } +} + +def screen-new-window -params .. -command-completion -docstring "Create a new window" %{ + %sh{ + tty="$(ps -o tty ${kak_client_pid} | tail -n 1)" + screen -X screen kak -c "${kak_session}" -e "$*" < "/dev/$tty" + } +} + +def -docstring %{screen-focus []: focus the given client +If no client is passed then the current one is used} \ + -params ..1 -client-completion \ + screen-focus %{ %sh{ + if [ $# -eq 1 ]; then + printf %s\\n " + evaluate-commands -client '$1' %{ %sh{ + screen -X focus + }}" + elif [ -n "kak_client_env_$STY" ]; then + tty="$(ps -o tty ${kak_client_pid} | tail -n 1)" + screen -X select "$kak_client_env_WINDOW" < "$/dev/$tty" + fi +} } From 133fcb0ce4806520244b002be43cbeb0e305ad45 Mon Sep 17 00:00:00 2001 From: Nicholas Ochiel Date: Wed, 15 Nov 2017 17:42:37 +0300 Subject: [PATCH 2/2] code review: typos. --- rc/base/screen.kak | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rc/base/screen.kak b/rc/base/screen.kak index b60fbd1e..e95bb3b0 100644 --- a/rc/base/screen.kak +++ b/rc/base/screen.kak @@ -3,7 +3,7 @@ hook global KakBegin .* %{ %sh{ - [ -z "kak_client_env_$STY" ] && exit + [ -z "${kak_client_env_STY}" ] && exit echo " alias global focus screen-focus alias global new screen-new-vertical @@ -14,7 +14,6 @@ hook global KakBegin .* %{ def screen-new-vertical -params .. -command-completion -docstring "Create a new vertical region" %{ %sh{ - tty="$(ps -o tty ${kak_client_pid} | tail -n 1)" screen -X eval 'split -h' 'focus down' "screen kak -c \"${kak_session}\" -e \"$*\"" < "/dev/$tty" } @@ -43,8 +42,8 @@ If no client is passed then the current one is used} \ evaluate-commands -client '$1' %{ %sh{ screen -X focus }}" - elif [ -n "kak_client_env_$STY" ]; then + elif [ -n "${kak_client_env_STY}" ]; then tty="$(ps -o tty ${kak_client_pid} | tail -n 1)" - screen -X select "$kak_client_env_WINDOW" < "$/dev/$tty" + screen -X select "$kak_client_env_WINDOW" < "/dev/$tty" fi } }