Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework cursor detection

Browse source 
Fixes #3499.

(cherry picked from commit 2a5ad198bf)
This commit is contained in:
Fabian Homborg 2016-10-27 23:04:12 +02:00 committed by David Adam
parent 7bcae09674
commit c8fe0e53dd
1 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
share/functions/fish_vi_cursor.fish
View file

@ -1,21 +1,45 @@
function fish_vi_cursor -d 'Set cursor shape for different vi modes' function fish_vi_cursor -d 'Set cursor shape for different vi modes'
# Since we read exported variables (KONSOLE_PROFILE_NAME and ITERM_PROFILE) # Check hard if we are in a supporting terminal.
# we need to check harder if we're actually in a supported terminal, #
# because we might be in a term-in-a-term (emacs ansi-term). # Challenges here are term-in-a-terms (emacs ansi-term does not support this, tmux does),
if not contains -- $TERM xterm konsole xterm-256color konsole-256color # that we can only figure out if we are in konsole/iterm/vte via exported variables,
and not set -q TMUX # and ancient xterm versions.
return #
# tmux defaults to $TERM = screen, but can do this if it is in a supporting terminal.
# Unfortunately, we can only detect this via the exported variables, so we miss some cases.
#
# We will also miss some cases of terminal-stacking,
# e.g. tmux started in suckless' st (no support) started in konsole.
# But since tmux in konsole seems rather common and that case so uncommon,
# we will just fail there (though it seems that tmux or st swallow it anyway).
#
# We use the `tput` here just to see if terminfo thinks we can change the cursor.
# We cannot use that sequence directly as it's not the correct one for konsole and iTerm,
# and because we may want to change the cursor even though terminfo says we can't (tmux).
if not tput Ss > /dev/null
# Whitelist tmux...
and not begin
set -q TMUX
# ...in a supporting term...
and begin set -q KONSOLE_PROFILE_NAME
or set -q ITERM_PROFILE
or test "$VTE_VERSION" -gt 1910
end end
# .. unless an unsupporting terminal has been started in tmux inside a supporting one
# XTerm supports this sequence since version 282 and begin string match -q "screen*" -- $TERM
if test -n "$XTERM_VERSION" or string match -q "tmux*" -- $TERM
# This will fail if $XTERM_VERSION is not in the "XTerm($version)" format.
# In that case, we cannot determine the terminal and should stop
# so "[1 q" does not show up on the user's screen
if not test (string replace -r 'XTerm\((\d*)\)' '$1' -- $XTERM_VERSION) -ge 282
return
end end
end end
and not string match -q "konsole*" -- $TERM
# Blacklist
or begin
# vte-based terms set $TERM = xterm*, but only gained support relatively recently.
set -q VTE_VERSION
and test "$VTE_VERSION" -le 1910
end
or set -q INSIDE_EMACS
return
end
set -l terminal $argv[1] set -l terminal $argv[1]
set -q terminal[1] set -q terminal[1]
@ -29,11 +53,9 @@ function fish_vi_cursor -d 'Set cursor shape for different vi modes'
or set -q ITERM_PROFILE or set -q ITERM_PROFILE
set function __fish_cursor_konsole set function __fish_cursor_konsole
set uses_echo 1 set uses_echo 1
else if string match -q "xterm*" -- $TERM; or test "$VTE_VERSION" -gt 1910 else
set function __fish_cursor_xterm set function __fish_cursor_xterm
set uses_echo 1 set uses_echo 1
else
return 1
end end
case konsole case konsole
set function __fish_cursor_konsole set function __fish_cursor_konsole