From 9363a84ed512935fc033058a446dce673aec8ece Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Wed, 6 Mar 2024 00:49:03 +0100 Subject: [PATCH] Add Terminal.app support --- rc/windowing/appleterminal.kak | 44 ++++++++++++++++++++++++++++++++++ rc/windowing/detection.kak | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 rc/windowing/appleterminal.kak diff --git a/rc/windowing/appleterminal.kak b/rc/windowing/appleterminal.kak new file mode 100644 index 000000000..f47c83cc8 --- /dev/null +++ b/rc/windowing/appleterminal.kak @@ -0,0 +1,44 @@ +# macOS Terminal.app +# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ + +provide-module appleterminal %{ + +# ensure that we're running in Terminal.app +evaluate-commands %sh{ + [ -z "${kak_opt_windowing_modules}" ] || [ "$TERM_PROGRAM" = "Apple_Terminal" ] || echo 'fail Terminal.app not detected' +} + +define-command appleterminal-terminal-window -params 1.. -docstring ' +appleterminal-terminal-window []: create a new terminal as a Terminal.app window +The program passed as argument will be executed in the new terminal'\ +%{ + nop %sh{ + # join the arguments as one string for the shell execution (see x11.kak) + quoted=$( + for i in exec env "PATH=$PATH" "TMPDIR=$TMPDIR" "$@"; do + printf "'%s' " "$(printf %s "$i" | sed "s|'|'\\\\''|g")" + done + ) + + # since Terminal.app runs the command in the interactive shell, add initial space to prevent adding it to shell history + cmd=" $quoted" + echo "$cmd" | osascript \ + -e 'set s to (do shell script "cat 0<&3")' \ + -e 'tell application "Terminal" to do script s' >/dev/null 3<&0 + } +} +complete-command appleterminal-terminal-window shell + +alias global terminal appleterminal-terminal-window + +define-command appleterminal-focus -params ..1 -docstring ' +appleterminal-focus []: focus the given client +If no client is passed then the current one is used' \ +%{ + fail 'Focusing Terminal.app client is unimplemented' +} +complete-command -menu appleterminal-focus client + +alias global focus appleterminal-focus + +} diff --git a/rc/windowing/detection.kak b/rc/windowing/detection.kak index 9e9f2f645..ebdaf2081 100644 --- a/rc/windowing/detection.kak +++ b/rc/windowing/detection.kak @@ -23,7 +23,7 @@ declare-option -docstring \ "Ordered list of windowing modules to try and load. An empty list disables both automatic module loading and environment detection, enabling complete manual control of the module loading." \ -str-list windowing_modules 'tmux' 'screen' 'zellij' 'kitty' 'iterm' 'sway' 'wayland' 'x11' 'wezterm' +str-list windowing_modules 'tmux' 'screen' 'zellij' 'kitty' 'iterm' 'appleterminal' 'sway' 'wayland' 'x11' 'wezterm' declare-option -docstring %{ windowing module to use in the 'terminal' command