Browse Source

[#50] Bind to both emacs and vi keymaps

master
Sorin Ionescu 13 years ago
parent
commit
12a4117525
  1. 91
      keyboard.zsh

91
keyboard.zsh

@ -124,11 +124,7 @@ function prepend-sudo() {
} }
zle -N prepend-sudo zle -N prepend-sudo
zstyle -s ':omz:editor' keymap 'keymap' # Emacs key bindings.
if [[ "$keymap" == (emacs|) ]]; then
# Use Emacs key bindings.
bindkey -e
[[ -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Escape]"{B,b}; \ for key in "$keyinfo[Escape]"{B,b}; \
bindkey -M emacs "$key" emacs-backward-word bindkey -M emacs "$key" emacs-backward-word
@ -183,9 +179,8 @@ if [[ "$keymap" == (emacs|) ]]; then
bindkey -M emacs "$keyinfo[Control]S" \ bindkey -M emacs "$keyinfo[Control]S" \
history-incremental-search-forward history-incremental-search-forward
fi fi
elif [[ "$keymap" == vi ]]; then
# Use vi key bindings. # Vi key bindings.
bindkey -v
# Edit command in an external editor. # Edit command in an external editor.
bindkey -M vicmd "v" edit-command-line bindkey -M vicmd "v" edit-command-line
@ -228,95 +223,103 @@ elif [[ "$keymap" == vi ]]; then
bindkey -M vicmd "?" history-incremental-search-backward bindkey -M vicmd "?" history-incremental-search-backward
bindkey -M vicmd "/" history-incremental-search-forward bindkey -M vicmd "/" history-incremental-search-forward
fi fi
else
print "omz: invalid keymap: $keymap" >&2
unset keymap
return 1
fi
unset keymap
# The next key bindings are for both Emacs and Vi. # Emacs and Vi key bindings.
for keymap in 'emacs' 'viins'; do
[[ -n "$keyinfo[Home]" ]] && \ [[ -n "$keyinfo[Home]" ]] && \
bindkey "$keyinfo[Home]" beginning-of-line bindkey -M "$keymap" "$keyinfo[Home]" beginning-of-line
[[ -n "$keyinfo[End]" ]] && \ [[ -n "$keyinfo[End]" ]] && \
bindkey "$keyinfo[End]" end-of-line bindkey -M "$keymap" "$keyinfo[End]" end-of-line
[[ -n "$keyinfo[Insert]" ]] && \ [[ -n "$keyinfo[Insert]" ]] && \
bindkey "$keyinfo[Insert]" overwrite-mode bindkey -M "$keymap" "$keyinfo[Insert]" overwrite-mode
[[ -n "$keyinfo[Delete]" ]] && \ [[ -n "$keyinfo[Delete]" ]] && \
bindkey "$keyinfo[Delete]" delete-char bindkey -M "$keymap" "$keyinfo[Delete]" delete-char
[[ -n "$keyinfo[Backspace]" ]] && \ [[ -n "$keyinfo[Backspace]" ]] && \
bindkey "$keyinfo[Backspace]" backward-delete-char && \ bindkey -M "$keymap" "$keyinfo[Backspace]" backward-delete-char && \
stty erase "$keyinfo[Backspace]" stty erase "$keyinfo[Backspace]"
[[ -n "$keyinfo[Left]" ]] && \ [[ -n "$keyinfo[Left]" ]] && \
bindkey "$keyinfo[Left]" backward-char bindkey -M "$keymap" "$keyinfo[Left]" backward-char
[[ -n "$keyinfo[Right]" ]] && \ [[ -n "$keyinfo[Right]" ]] && \
bindkey "$keyinfo[Right]" forward-char bindkey -M "$keymap" "$keyinfo[Right]" forward-char
# Expand history on space. # Expand history on space.
bindkey ' ' magic-space bindkey -M "$keymap" ' ' magic-space
if (( $+plugins[(er)history-substring-search] )); then if (( $+plugins[(er)history-substring-search] )); then
[[ -n "$keyinfo[Up]" ]] && \ [[ -n "$keyinfo[Up]" ]] && \
bindkey "$keyinfo[Up]" history-substring-search-up bindkey -M "$keymap" "$keyinfo[Up]" history-substring-search-up
[[ -n "$keyinfo[Down]" ]] && \ [[ -n "$keyinfo[Down]" ]] && \
bindkey "$keyinfo[Down]" history-substring-search-down bindkey -M "$keymap" "$keyinfo[Down]" history-substring-search-down
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]P" history-substring-search-up bindkey -M "$keymap" "$keyinfo[Control]P" history-substring-search-up
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]N" history-substring-search-down bindkey -M "$keymap" "$keyinfo[Control]N" history-substring-search-down
else else
[[ -n "$keyinfo[Up]" ]] && \ [[ -n "$keyinfo[Up]" ]] && \
bindkey "$keyinfo[Up]" up-line-or-history bindkey -M "$keymap" "$keyinfo[Up]" up-line-or-history
[[ -n "$keyinfo[Down]" ]] && \ [[ -n "$keyinfo[Down]" ]] && \
bindkey "$keyinfo[Down]" down-line-or-history bindkey -M "$keymap" "$keyinfo[Down]" down-line-or-history
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]P" up-line-or-history bindkey -M "$keymap" "$keyinfo[Control]P" up-line-or-history
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]N" down-line-or-history bindkey -M "$keymap" "$keyinfo[Control]N" down-line-or-history
fi fi
# Clear screen. # Clear screen.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]L" clear-screen bindkey -M "$keymap" "$keyinfo[Control]L" clear-screen
# Expand command name to full path. # Expand command name to full path.
[[ -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Escape]"{E,e}; \ for key in "$keyinfo[Escape]"{E,e}; \
bindkey "$key" expand-cmd-path bindkey -M "$keymap" "$key" expand-cmd-path
# Duplicate the previous word. # Duplicate the previous word.
[[ -n "$keyinfo[Escape]" ]] && \ [[ -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Escape]"{M,m}; \ for key in "$keyinfo[Escape]"{M,m}; \
bindkey "$key" copy-prev-shell-word bindkey -M "$keymap" "$key" copy-prev-shell-word
# Use a more flexible push-line.
[[ -n "$keyinfo[Control]" && -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Control]Q" "$keyinfo[Escape]"{q,Q}; \
bindkey -M "$keymap" "$key" push-line-or-edit
# Bind Shift + Tab to go to the previous menu item. # Bind Shift + Tab to go to the previous menu item.
[[ -n "$keyinfo[BackTab]" ]] && \ [[ -n "$keyinfo[BackTab]" ]] && \
bindkey "$keyinfo[BackTab]" reverse-menu-complete bindkey -M "$keymap" "$keyinfo[BackTab]" reverse-menu-complete
# Complete in the middle of word. # Complete in the middle of word.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]I" expand-or-complete-prefix bindkey -M "$keymap" "$keyinfo[Control]I" expand-or-complete-prefix
# Convert .... to ../.. automatically. # Convert .... to ../.. automatically.
if zstyle -t ':omz:editor' dot-expansion; then if zstyle -t ':omz:editor' dot-expansion; then
# Do not expand during incremental search. # Do not expand during incremental search.
bindkey -M isearch . self-insert 2>/dev/null bindkey -M "$keymap" -M isearch . self-insert 2>/dev/null
fi fi
# Display an indicator when completing. # Display an indicator when completing.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]I" expand-or-complete-prefix-with-indicator bindkey -M "$keymap" "$keyinfo[Control]I" \
expand-or-complete-prefix-with-indicator
# Use a more flexible push-line.
[[ -n "$keyinfo[Control]" && -n "$keyinfo[Escape]" ]] && \
for key in "$keyinfo[Control]Q" "$keyinfo[Escape]"{q,Q}; \
bindkey "$key" push-line-or-edit
# Insert 'sudo ' at the beginning of the line. # Insert 'sudo ' at the beginning of the line.
[[ -n "$keyinfo[Control]" ]] && \ [[ -n "$keyinfo[Control]" ]] && \
bindkey "$keyinfo[Control]X$keyinfo[Control]S" prepend-sudo bindkey -M "$keymap" "$keyinfo[Control]X$keyinfo[Control]S" prepend-sudo
done
# Set the key layout.
zstyle -s ':omz:editor' keymap 'keymap'
if [[ "$keymap" == (emacs|) ]]; then
bindkey -e
elif [[ "$keymap" == vi ]]; then
bindkey -v
else
print "omz: invalid keymap: $keymap" >&2
fi
unset keymap
unset key unset key

Loading…
Cancel
Save