KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Shell integration: Improvements in fish integration

Browse Source
This commit is contained in:
pagedown 2022-01-15 12:01:47 +08:00
parent 9813ad04c2
commit 77787bdc7c
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
View File

@ -1,53 +1,64 @@
#!/bin/fish #!/bin/fish
status --is-interactive || exit 0
not functions -q _ksi_schedule || exit 0
function _ksi_main function _ksi_main
test -z "$KITTY_SHELL_INTEGRATION" && return test -n "$KITTY_SHELL_INTEGRATION" || return 0
if set -q XDG_DATA_DIRS KITTY_FISH_XDG_DATA_DIR if set -q XDG_DATA_DIRS KITTY_FISH_XDG_DATA_DIR
set --global --export --path XDG_DATA_DIRS "$XDG_DATA_DIRS" set --global --export --path XDG_DATA_DIRS "$XDG_DATA_DIRS"
if set -l index (contains -i "$KITTY_FISH_XDG_DATA_DIR" $XDG_DATA_DIRS) if set -l index (contains -i "$KITTY_FISH_XDG_DATA_DIR" $XDG_DATA_DIRS)
set --erase --global XDG_DATA_DIRS[$index] set --erase --global XDG_DATA_DIRS[$index]
test -z "$XDG_DATA_DIRS" && set --erase --global XDG_DATA_DIRS test -n "$XDG_DATA_DIRS" || set --erase --global XDG_DATA_DIRS
end end
if set -q XDG_DATA_DIRS if set -q XDG_DATA_DIRS
set --global --export --unpath XDG_DATA_DIRS "$XDG_DATA_DIRS" set --global --export --unpath XDG_DATA_DIRS "$XDG_DATA_DIRS"
end end
end end
set --local _ksi (string split " " -- "$KITTY_SHELL_INTEGRATION") set --local _ksi (string split " " -- "$KITTY_SHELL_INTEGRATION")
set --erase KITTY_SHELL_INTEGRATION set --erase KITTY_SHELL_INTEGRATION KITTY_FISH_XDG_DATA_DIR
set --erase KITTY_FISH_XDG_DATA_DIR
function _ksi_osc function _ksi_osc
printf "\e]%s\a" "$argv[1]" printf "\e]%s\a" "$argv[1]"
end end
if not contains "no-complete" $_ksi if not contains "no-complete" $_ksi
and not functions -q _ksi_completions
function _ksi_completions function _ksi_completions
set --local ct (commandline --current-token) set --local ct (commandline --current-token)
set --local tokens (commandline --tokenize --cut-at-cursor --current-process) set --local tokens (commandline --tokenize --cut-at-cursor --current-process)
printf "%s\n" $tokens $ct | kitty +complete fish2 printf "%s\n" $tokens $ct | command kitty +complete fish2
end end
end end
if not contains "no-cursor" $_ksi if not contains "no-cursor" $_ksi
and not functions -q _ksi_set_cursor
function _ksi_set_cursor --on-variable fish_key_bindings function _ksi_set_cursor --on-variable fish_key_bindings
if test "$fish_key_bindings" = fish_default_key_bindings if test "$fish_key_bindings" = fish_default_key_bindings
and not functions -q _ksi_bar_cursor _ksi_block_cursor
function _ksi_bar_cursor --on-event fish_prompt function _ksi_bar_cursor --on-event fish_prompt
printf "\e[5 q" printf "\e[5 q"
end end
function _ksi_block_cursor --on-event fish_preexec function _ksi_block_cursor --on-event fish_preexec
printf "\e[2 q" printf "\e[2 q"
end end
else else
functions -q _ksi_bar_cursor && functions --erase _ksi_bar_cursor functions --erase _ksi_bar_cursor _ksi_block_cursor
functions -q _ksi_block_cursor && functions --erase _ksi_block_cursor
end end
end end
function _ksi_set_vi_cursor
set -q $argv[1] || set --global $argv[1] $argv[2] blink
end
_ksi_set_cursor _ksi_set_cursor
set -q fish_cursor_default || set --global fish_cursor_default block blink _ksi_set_vi_cursor fish_cursor_default block
set -q fish_cursor_insert || set --global fish_cursor_insert line blink _ksi_set_vi_cursor fish_cursor_insert line
set -q fish_cursor_replace_one || set --global fish_cursor_replace_one underscore blink _ksi_set_vi_cursor fish_cursor_replace_one underscore
set -q fish_cursor_visual || set --global fish_cursor_visual block blink _ksi_set_vi_cursor fish_cursor_visual block
# Change the cursor shape on the first run # Change the cursor shape on the first run
if functions -q _ksi_bar_cursor if functions -q _ksi_bar_cursor
@ -59,11 +70,13 @@ function _ksi_main
printf "\e[5 q" printf "\e[5 q"
end end
end end
functions --erase _ksi_set_vi_cursor
end end
if not contains "no-title" $_ksi if not contains "no-title" $_ksi
function _ksi_function_is_not_overridden -d "Check if the specified function is not overridden" function _ksi_function_is_not_overridden -d "Check if the specified function is not overridden"
string match -q -- "$__fish_data_dir/functions/*" (functions --details $argv[1]) functions --details $argv[1] | string match -q -- "$__fish_data_dir/functions/*"
end end
if _ksi_function_is_not_overridden fish_title if _ksi_function_is_not_overridden fish_title
@ -80,13 +93,14 @@ function _ksi_main
end end
if not contains "no-prompt-mark" $_ksi if not contains "no-prompt-mark" $_ksi
and not functions -q _ksi_mark
set --global _ksi_prompt_state "first-run" set --global _ksi_prompt_state "first-run"
function _ksi_function_is_not_empty -d "Check if the specified function exists and is not empty" function _ksi_function_is_not_empty -d "Check if the specified function exists and is not empty"
functions $argv[1] | string match -qnvr '^ *(#|function |end$|$)' functions --no-details $argv[1] | string match -qnvr '^ *(#|function |end$|$)'
end end
function _ksi_mark -d "tell kitty to mark the current cursor position using OSC 133" function _ksi_mark -d "Tell kitty to mark the current cursor position using OSC 133"
_ksi_osc "133;$argv[1]" _ksi_osc "133;$argv[1]"
end end
@ -152,10 +166,6 @@ function _ksi_main
functions --erase _ksi_main _ksi_schedule functions --erase _ksi_main _ksi_schedule
end end
if status --is-interactive function _ksi_schedule --on-event fish_prompt -d "Setup kitty integration after other scripts have run, we hope"
function _ksi_schedule --on-event fish_prompt -d "Setup kitty integration after other scripts have run, we hope" _ksi_main
_ksi_main
end
else
functions --erase _ksi_main
end end