github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 08:41:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Activate fish_vi_cursor for tmux

Browse Source 
Discussions with the tmux maintainer show that:

1. We no longer need the passthrough sequence at all (and it's
deactivated by default)
2. Tmux can check if the outer terminal supports cursor shaping

Fixes #8981
This commit is contained in:
Fabian Boehm 2022-06-20 17:37:22 +02:00
parent da020c0641
commit b4a3b9982c
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
share/functions/fish_vi_cursor.fish
View File

@ -37,9 +37,6 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
# - It is set for xterm, and everyone and their dog claims to be xterm
#
# So we just don't care about $TERM, unless it is one of the few terminals that actually have their own entry.
#
# Note: Previous versions also checked $TMUX, and made sure that then $TERM was screen* or tmux*.
# We don't care, since we *cannot* handle term-in-a-terms 100% correctly.
if not set -q KONSOLE_PROFILE_NAME
and not test -n "$KONSOLE_VERSION" -a "$KONSOLE_VERSION" -ge 200400 # konsole, but new.
and not set -q ITERM_PROFILE
@ -52,6 +49,10 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
and not string match -q 'rxvt*' -- $TERM
and not string match -q 'alacritty*' -- $TERM
and not string match -q 'foot*' -- $TERM
and not begin
set -q TMUX
and string match -qr '^screen|^tmux' -- $TERM
end
return
end
end
@ -78,13 +79,6 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
set function __fish_cursor_xterm
end
set -l tmux_prefix
set -l tmux_postfix
if set -q TMUX
set tmux_prefix echo -ne "'\ePtmux;\e'"
set tmux_postfix echo -ne "'\e\\\\'"
end
set -q fish_cursor_unknown
or set -g fish_cursor_unknown block
@ -94,9 +88,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
if not set -q \$varname
set varname fish_cursor_unknown
end
$tmux_prefix
$function \$\$varname
$tmux_postfix
end
" | source
@ -106,9 +98,7 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
if not set -q \$varname
set varname fish_cursor_unknown
end
$tmux_prefix
$function \$\$varname
$tmux_postfix
end
" | source
end