xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Match on kitty window id when available

Browse Source 
This ensures new window are created in the same os window as the
current client instead of the default one.

Closes #4009
This commit is contained in:
Maxime Coste 2021-03-01 08:47:09 +11:00
parent ca5e6f835c
commit bdee3abd88
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rc/windowing/kitty.kak
View File

@ -15,10 +15,15 @@ kitty-terminal <program> [<arguments>]: create a new terminal as a kitty window
The program passed as argument will be executed in the new terminal' \ The program passed as argument will be executed in the new terminal' \
%{ %{
nop %sh{ nop %sh{
local match=""
if [ -n "$kak_client_env_KITTY_WINDOW_ID" ]; then
match="--match=id:$kak_client_env_KITTY_WINDOW_ID"
fi
if [ -z "$kak_client_env_KITTY_LISTEN_ON" ]; then if [ -z "$kak_client_env_KITTY_LISTEN_ON" ]; then
kitty @ new-window --no-response --window-type "$kak_opt_kitty_window_type" --cwd "$PWD" "$@" kitty @ new-window --no-response --window-type "$kak_opt_kitty_window_type" --cwd "$PWD" $match "$@"
else else
kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" new-window --no-response --window-type "$kak_opt_kitty_window_type" --cwd "$PWD" "$@" kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" new-window --no-response --window-type "$kak_opt_kitty_window_type" --cwd "$PWD" $match "$@"
fi fi
} }
} }
@ -28,10 +33,15 @@ kitty-terminal-tab <program> [<arguments>]: create a new terminal as kitty tab
The program passed as argument will be executed in the new terminal' \ The program passed as argument will be executed in the new terminal' \
%{ %{
nop %sh{ nop %sh{
local match=""
if [ -n "$kak_client_env_KITTY_WINDOW_ID" ]; then
match="--match=id:$kak_client_env_KITTY_WINDOW_ID"
fi
if [ -z "$kak_client_env_KITTY_LISTEN_ON" ]; then if [ -z "$kak_client_env_KITTY_LISTEN_ON" ]; then
kitty @ new-window --no-response --new-tab --cwd "$PWD" "$@" kitty @ new-window --no-response --new-tab --cwd "$PWD" $match "$@"
else else
kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" new-window --no-response --new-tab --cwd "$PWD" "$@" kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" new-window --no-response --new-tab --cwd "$PWD" $match "$@"
fi fi
} }
} }
@ -45,11 +55,11 @@ If no client is passed then the current one is used' \
printf "evaluate-commands -client '%s' focus" "$1" printf "evaluate-commands -client '%s' focus" "$1"
else else
if [ -z "$kak_client_env_KITTY_LISTEN_ON" ]; then if [ -z "$kak_client_env_KITTY_LISTEN_ON" ]; then
kitty @ focus-tab --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID kitty @ focus-tab --no-response --match=id:$kak_client_env_KITTY_WINDOW_ID
kitty @ focus-window --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID kitty @ focus-window --no-response --match=id:$kak_client_env_KITTY_WINDOW_ID
else else
kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" focus-tab --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" focus-tab --no-response --match=id:$kak_client_env_KITTY_WINDOW_ID
kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" focus-window --no-response -m=id:$kak_client_env_KITTY_WINDOW_ID kitty @ --to "$kak_client_env_KITTY_LISTEN_ON" focus-window --no-response --match=id:$kak_client_env_KITTY_WINDOW_ID
fi fi
fi fi
} }