mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-28 18:53:47 +08:00
Code Issues Releases Wiki Activity

fix(vi-mode): re-render cursor after exisiting visual mode (ohmyzsh#11705)

Browse Source 
Following the suggestion in #11705, this PR removes the wrapping of the
visual-mode widget and instead uses the zli-line-pre-redraw hook
([special
widget](https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Special-Widgets))
to check state and change the cursor accordingly.

My understanding is that the
[REGION_ACTIVE](https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#index-REGION_005fACTIVE)
variable indicates which characters/regions are to be highlighted, and
it has values of:
- 0: no highlight
- 1: character/region highlight active
- 2: line highlight active

and that for visual/visual-line modes, VI_KEYMAP must be updated
by the plugin itself.

fixes 11705
This commit is contained in:
Kevin W Matthews 2026-02-22 15:07:56 -05:00 committed by Kevin Matthews
parent 400591e71c
commit 169e9c87ff
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/vi-mode/vi-mode.plugin.zsh
View File

@ -31,24 +31,32 @@ function _vi-mode-set-cursor-shape-for-keymap() {
# https://vt100.net/docs/vt510-rm/DECSCUSR
local _shape=0
case "${1:-${VI_KEYMAP:-main}}" in
main) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
viins) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
isearch) _shape=$VI_MODE_CURSOR_INSERT ;; # inc search: line
command) _shape=$VI_MODE_CURSOR_INSERT ;; # read a command name
vicmd) _shape=$VI_MODE_CURSOR_NORMAL ;; # vi cmd: block
visual) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual mode: block
viopp) _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block
*) _shape=0 ;;
main) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
viins) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
isearch) _shape=$VI_MODE_CURSOR_INSERT ;; # inc search: line
command) _shape=$VI_MODE_CURSOR_INSERT ;; # read a command name
vicmd) _shape=$VI_MODE_CURSOR_NORMAL ;; # vi cmd: block
visual) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual mode: block
visual-line) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual line mode: block
viopp) _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block
*) _shape=0 ;;
esac
printf $'\e[%d q' "${_shape}"
}
function _visual-mode {
typeset -g VI_KEYMAP=visual
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
zle .visual-mode
function zle-line-pre-redraw() {
if [[ "$REGION_ACTIVE" -eq 0 && ("$VI_KEYMAP" == visual || "$VI_KEYMAP" == visual-line) ]]; then
typeset -g VI_KEYMAP=$KEYMAP
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
elif [[ "$REGION_ACTIVE" -eq 1 && "$VI_KEYMAP" != "visual" ]]; then
typeset -g VI_KEYMAP=visual
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
elif [[ "$REGION_ACTIVE" -eq 2 && "$VI_KEYMAP" != "visual-line" ]]; then
typeset -g VI_KEYMAP=visual-line
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
fi
}
zle -N visual-mode _visual-mode
zle -N zle-line-pre-redraw
function _vi-mode-should-reset-prompt() {
# If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE is unset (default), dynamically