746e0d032f
Today I can control "terminal" and "new" by changing the terminal
alias but I always need to choose a concrete implementation, like
"tmux-terminal-horizontal", even when there is otherwise no need to
mention tmux in my config.
Allow to configure windowing system and window placement independently
by introducing dedicated options.
This allows to create mappings that work in any windowing system like
map global user c %{:with-option windowing_placement window new<ret>}
map global user '"' %{:with-option windowing_placement vertical new<ret>}
map global user '%' %{:with-option windowing_placement horizontal new<ret>}
For windowing systems that don't support all placements, you can wrap
the above in try/catch to fall back on the "window" variant which is
defined for all windowing systems.
When using multiple (nested) windowing systems, you might want to
add mappings like
map global user t %{:with-option windowing_module tmux new<ret>}
map global user T %{:with-option windowing_module wayland new<ret>}
---
This changes the default "terminal" alias for some modules. In
particular, instead of delegating to
iterm-terminal-vertical
screen-terminal-vertical
tmux-terminal-horizontal
wezterm-terminal-vertical
it will now by default delegate to the respective "-window" variant.
We could maintain backwards compatiblity here by setting the
"windowing_placement" option accordingly, but the new behavior seems
more logical?
Also, this removes the "terminal-tab" alias which was only defined
by the kitty module.
We could try to keep the alias approach and implement a "with-alias"
command, however that approach can only capture both dimensions
(windowing system and placement) if we add tons of commands
like "terminal-horizontal" (with implied windowing system) and
"tmux-terminal" (with implied placement).
Side thought: we could also get rid of the "focus" alias and instead
define
define-command focus %{
"%opt{windowing_module}-focus"
}
Closes #3943, #4425
85 lines
2.7 KiB
Plaintext
85 lines
2.7 KiB
Plaintext
# https://sw.kovidgoyal.net/kitty/index.html
|
|
# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
|
|
|
|
provide-module kitty %{
|
|
|
|
# ensure that we're running on kitty
|
|
evaluate-commands %sh{
|
|
[ -z "${kak_opt_windowing_modules}" ] || [ "$TERM" = "xterm-kitty" ] || echo 'fail Kitty not detected'
|
|
}
|
|
|
|
declare-option -docstring %{window type that kitty creates on new and repl calls (window|os-window)} str kitty_window_type window
|
|
|
|
define-command kitty-terminal-window -params 1.. -docstring '
|
|
kitty-terminal-window <program> [<arguments>]: create a new terminal as a kitty window
|
|
The program passed as argument will be executed in the new terminal' \
|
|
%{
|
|
nop %sh{
|
|
match=""
|
|
if [ -n "$kak_client_env_KITTY_WINDOW_ID" ]; then
|
|
match="--match=window_id:$kak_client_env_KITTY_WINDOW_ID"
|
|
fi
|
|
|
|
listen=""
|
|
if [ -n "$kak_client_env_KITTY_LISTEN_ON" ]; then
|
|
listen="--to=$kak_client_env_KITTY_LISTEN_ON"
|
|
fi
|
|
|
|
kitty @ $listen launch --no-response --type="$kak_opt_kitty_window_type" --cwd="$PWD" $match "$@"
|
|
}
|
|
}
|
|
complete-command kitty-terminal-window shell
|
|
|
|
define-command kitty-terminal-tab -params 1.. -docstring '
|
|
kitty-terminal-tab <program> [<arguments>]: create a new terminal as kitty tab
|
|
The program passed as argument will be executed in the new terminal' \
|
|
%{
|
|
nop %sh{
|
|
match=""
|
|
if [ -n "$kak_client_env_KITTY_WINDOW_ID" ]; then
|
|
match="--match=window_id:$kak_client_env_KITTY_WINDOW_ID"
|
|
fi
|
|
|
|
listen=""
|
|
if [ -n "$kak_client_env_KITTY_LISTEN_ON" ]; then
|
|
listen="--to=$kak_client_env_KITTY_LISTEN_ON"
|
|
fi
|
|
|
|
kitty @ $listen launch --no-response --type=tab --cwd="$PWD" $match "$@"
|
|
}
|
|
}
|
|
complete-command kitty-terminal-tab shell
|
|
|
|
define-command kitty-focus -params ..1 -docstring '
|
|
kitty-focus [<client>]: focus the given client
|
|
If no client is passed then the current one is used' \
|
|
%{
|
|
evaluate-commands %sh{
|
|
if [ $# -eq 1 ]; then
|
|
printf "evaluate-commands -client '%s' focus" "$1"
|
|
else
|
|
match=""
|
|
if [ -n "$kak_client_env_KITTY_WINDOW_ID" ]; then
|
|
match="--match=id:$kak_client_env_KITTY_WINDOW_ID"
|
|
fi
|
|
|
|
listen=""
|
|
if [ -n "$kak_client_env_KITTY_LISTEN_ON" ]; then
|
|
listen="--to=$kak_client_env_KITTY_LISTEN_ON"
|
|
fi
|
|
|
|
kitty @ $listen focus-window --no-response $match
|
|
fi
|
|
}
|
|
}
|
|
complete-command -menu kitty-focus client
|
|
|
|
alias global focus kitty-focus
|
|
|
|
# deprecated
|
|
define-command -hidden kitty-terminal -params 1.. %{
|
|
kitty-terminal-window %arg{@}
|
|
}
|
|
|
|
}
|