Bump github/codeql-action from 3 to 4

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3 to 4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[*.{sh,bash}]
+indent_style       = space
+indent_size        = 2
+simplify           = true
+binary_next_line   = false
+switch_case_indent = true
+space_redirects    = true
+function_next_line = false
+
+# also bash scripts.
+[{install,uninstall,bin/fzf-preview.sh,bin/fzf-tmux}]
+indent_style       = space
+indent_size        = 2
+simplify           = true
+binary_next_line   = false
+switch_case_indent = true
+space_redirects    = true
+function_next_line = false

.github/workflows/codeql-analysis.yml

@@ -33,12 +33,12 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/linux.yml

@@ -23,17 +23,17 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
-        go-version: "1.20"
+        go-version: "1.23"
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.4.1
+        ruby-version: 3.4.6
 
     - name: Install packages
-      run: sudo apt-get install --yes zsh fish tmux
+      run: sudo apt-get install --yes zsh fish tmux shfmt
 
     - name: Install Ruby gems
       run: bundle install

.github/workflows/macos.yml

@@ -20,9 +20,9 @@ jobs:
         fetch-depth: 0
 
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
-        go-version: "1.20"
+        go-version: "1.23"
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
@@ -30,7 +30,7 @@ jobs:
         ruby-version: 3.0.0
 
     - name: Install packages
-      run: HOMEBREW_NO_INSTALL_CLEANUP=1 brew install fish zsh tmux
+      run: HOMEBREW_NO_INSTALL_CLEANUP=1 brew install fish zsh tmux shfmt
 
     - name: Install Ruby gems
       run: gem install --no-document minitest:5.14.2 rubocop:1.0.0 rubocop-minitest:0.10.1 rubocop-performance:1.8.1

.tool-versions

@@ -1,2 +1,3 @@
-golang 1.20.14
+golang 1.23
-ruby 3.4.1
+ruby 3.4
+shfmt 3.12

BUILD.md

@@ -6,7 +6,7 @@ Build instructions
 
 ### Prerequisites
 
-- Go 1.20 or above
+- Go 1.23 or above
 
 ### Using Makefile
 
@@ -41,6 +41,20 @@ make release
 >     --profile-block /tmp/block.pprof --profile-mutex /tmp/mutex.pprof
 > ```
 
+Running tests
+-------------
+
+```sh
+# Run go unit tests
+make test
+
+# Run integration tests (requires to be on tmux)
+make itest
+
+# Run a single test case
+ruby test/runner.rb --name test_something
+```
+
 Third-party libraries used
 --------------------------
 

CHANGELOG.md

@@ -1,6 +1,295 @@
 CHANGELOG
 =========
 
+0.66.0
+------
+
+### Quick summary
+
+This version introduces many new features centered around the new "raw" mode.
+
+| Type        | Class   | Name                | Description                                        |
+| :--         | :--     | :--                 | :--                                                |
+| New         | Option  | `--raw`             | Enable raw mode by default                         |
+| New         | Option  | `--gutter CHAR`     | Set the gutter column character                    |
+| New         | Option  | `--gutter-raw CHAR` | Set the gutter column character in raw mode        |
+| Enhancement | Option  | `--listen SOCKET`   | Added support for Unix domain sockets              |
+| New         | Action  | `toggle-raw`        | Toggle raw mode                                    |
+| New         | Action  | `enable-raw`        | Enable raw mode                                    |
+| New         | Action  | `disable-raw`       | Disable raw mode                                   |
+| New         | Action  | `up-match`          | Move up to the matching item                       |
+| New         | Action  | `down-match`        | Move down to the matching item                     |
+| New         | Action  | `best`              | Move to the  matching item with the best score     |
+| New         | Color   | `nomatch`           | Color for non-matching items in raw mode           |
+| New         | Env Var | `FZF_RAW`           | Matching status in raw mode (0, 1, or undefined)   |
+| New         | Env Var | `FZF_DIRECTION`     | `up` or `down` depending on the layout             |
+| New         | Env Var | `FZF_SOCK`          | Path to the Unix domain socket fzf is listening on |
+| Enhancement | Key     | `CTRL-N`            | `down` -> `down-match`                             |
+| Enhancement | Key     | `CTRL-P`            | `up` -> `up-match`                                 |
+| Enhancement | Shell   | `CTRL-R` binding    | Toggle raw mode with `ALT-R`                       |
+| Enhancement | Shell   | `CTRL-R` binding    | Opt-out with an empty `FZF_CTRL_R_COMMAND`         |
+
+### 1. Introducing "raw" mode
+
+![](https://github.com/user-attachments/assets/9640ae11-b5f7-43fb-95f1-c29307fc17c2)
+
+This version introduces a new "raw" mode (named so because it shows the list
+"unfiltered"). In raw mode, non-matching items stay in their original positions,
+but appear dimmed. This allows you see surrounding items of a match and better
+understand the context of it. You can enable raw mode by default with `--raw`,
+but it's often more useful when toggled dynamically with the `toggle-raw`
+action.
+
+```sh
+tree | fzf --reverse --bind alt-r:toggle-raw
+```
+
+While non-matching items are displayed in a dimmed color, they are treated just
+like matching items, so you place the cursor on them and perform any action. If
+you prefer to navigate only through matching items, use the `down-match` and
+`up-match` actions, which are from now on bound to `CTRL-N` and `CTRL-P`
+respectively, and also to `ALT-DOWN` and `ALT-UP`.
+
+| Key        | Action       | With `--history` |
+| :--        | :--          | :--              |
+| `down`     | `down`       |                  |
+| `up`       | `up`         |                  |
+| `ctrl-j`   | `down`       |                  |
+| `ctrl-k`   | `up`         |                  |
+| `ctrl-n`   | `down-match` | `next-history`   |
+| `ctrl-p`   | `up-match`   | `prev-history`   |
+| `alt-down` | `down-match` |                  |
+| `alt-up`   | `up-match`   |                  |
+
+> [!NOTE]
+> `CTRL-N` and `CTRL-P` are bound to `next-history` and `prev-history` when
+> `--history` option is enabled, so in that case, you'll need to manually bind
+> them, or use `ALT-DOWN` and `ALT-UP` instead.
+
+> [!TIP]
+> `up-match` and `down-match` are equivalent to `up` and `down` when not in
+> raw mode, so you can safely bind them to `up` and `arrow` keys if you prefer.
+> ```sh
+> fzf --bind up:up-match,down:down-match
+> ```
+
+#### Customizing the behavior
+
+In raw mode, the input list is presented in its original order, unfiltered, and
+your cursor will not move to the matching item automatically. Here are ways to
+customize the behavior.
+
+```sh
+# When the result list is updated, move the cursor to the item with the best score
+# (assuming sorting is not disabled)
+fzf --raw --bind result:best
+
+# Move to the first matching item in the original list
+# - $FZF_RAW is set to 0 when raw mode is enabled and the current item is a non-match
+# - $FZF_DIRECTION is set to either 'up' or 'down' depending on the layout direction
+fzf --raw --bind 'result:first+transform:[[ $FZF_RAW = 0 ]] && echo $FZF_DIRECTION-match'
+```
+
+#### Customizing the look
+
+##### Gutter
+
+To make the mode visually distinct, the gutter column is rendered in a dashed
+line using `▖` character. But you can customize it with the `--gutter-raw CHAR`
+option.
+
+```sh
+# Use a thinner gutter instead of the default dashed line
+fzf --bind alt-r:toggle-raw --gutter-raw ▎
+```
+
+##### Color and style of non-matching items
+
+Non-matching items are displayed in a dimmed color by default, but you can
+change it with the `--color nomatch:...` option.
+
+```sh
+fzf --raw --color nomatch:red
+fzf --raw --color nomatch:red:dim
+fzf --raw --color nomatch:red:dim:strikethrough
+fzf --raw --color nomatch:red:dim:strikethrough:italic
+```
+
+For colored input, dimming alone may not be enough, and you may prefer to remove
+colors entirely. For that case, a new special style attribute `strip` has been
+added.
+
+```sh
+fd --color always | fzf --ansi --raw --color nomatch:dim:strip:strikethrough
+```
+
+#### Conditional actions for raw mode
+
+You may want to perform different actions depending on whether the current item
+is a match or not. For that, fzf now exports `$FZF_RAW` environment variable.
+
+It's:
+
+- Undefined if raw mode is disabled
+- `1` if the current item is a match
+- `0` otherwise
+
+```sh
+# Do not allow selecting non-matching items
+fzf --raw --bind 'enter:transform:[[ ${FZF_RAW-1} = 1 ]] && echo accept || echo bell'
+```
+
+#### Leveraging raw mode in shell integration
+
+The `CTRL-R` binding (command history) now lets you toggle raw mode with `ALT-R`.
+
+### 2. Style changes
+
+The screenshot on the right shows the updated gutter style:
+
+![](https://github.com/user-attachments/assets/8ea7b5ef-c99e-4686-905b-22eb078b700a)
+
+This version includes a few minor updates to fzf's classic visual style:
+
+- The gutter column is now narrower, rendered with the left-half block character (`▌`).
+- Markers no longer use background colors.
+- The `--color base16` theme (alias: `16`) has been updated for better compatibility with both dark and light themes.
+
+### 3. `--listen` now supports Unix domain sockets
+
+If an argument to `--listen` ends with `.sock`, fzf will listen on a Unix
+domain socket at the specified path.
+
+```sh
+fzf --listen /tmp/fzf.sock --no-tmux
+
+# GET
+curl --unix-socket /tmp/fzf.sock http
+
+# POST
+curl --unix-socket /tmp/fzf.sock http -d up
+```
+
+Note that any existing file at the given path will be removed before creating
+the socket, so avoid using an important file path.
+
+### 4. Added options
+
+#### `--gutter CHAR`
+
+The gutter column can now be customized using `--gutter CHAR` and styled with
+`--color gutter:...`. Examples:
+
+```sh
+# Right-aligned gutter
+fzf --gutter '▐'
+
+# Even thinner gutter
+fzf --gutter '▎'
+
+# Yellow checker pattern
+fzf --gutter '▚' --color gutter:yellow
+
+# Classic style
+fzf --gutter ' ' --color gutter:reverse
+```
+
+#### `--gutter-raw CHAR`
+
+As noted above, the `--gutter-raw CHAR` option was also added for customizing the gutter column in raw mode.
+
+### 5. Added actions
+
+The following actions were introduced to support working with raw mode:
+
+| Action        | Description                                                                                 |
+| :--           | :--                                                                                         |
+| `toggle-raw`  | Toggle raw mode                                                                             |
+| `enable-raw`  | Enable raw mode                                                                             |
+| `disable-raw` | Disable raw mode                                                                            |
+| `up-match`    | Move up to the matching item; identical to `up` if raw mode is disabled                     |
+| `down-match`  | Move down to the matching item; identical to `down` if raw mode is disabled                 |
+| `best`        | Move to the matching item with the best score; identical to `first` if raw mode is disabled |
+
+### 6. Added environment variables
+
+#### `$FZF_DIRECTION`
+
+`$FZF_DIRECTION` is now exported to child processes, indicating the list direction of the current layout:
+
+- `up` for the default layout
+- `down` for `reverse` or `reverse-list`
+
+This simplifies writing transform actions involving layout-dependent actions
+like `{up,down}-match`, `{up,down}-selected`, and `toggle+{up,down}`.
+
+```sh
+fzf --raw --bind 'result:first+transform:[[ $FZF_RAW = 0 ]] && echo $FZF_DIRECTION-match'
+```
+
+#### `$FZF_SOCK`
+
+When fzf is listening on a Unix domain socket using `--listen`, the path to the
+socket is exported as `$FZF_SOCK`, analogous to `$FZF_PORT` for TCP sockets.
+
+#### `$FZF_RAW`
+
+As described above, `$FZF_RAW` is now exported to child processes in raw mode,
+indicating whether the current item is a match (`1`) or not (`0`). It is not
+defined when not in raw mode.
+
+#### `$FZF_CTRL_R_COMMAND`
+
+You can opt-out `CTRL-R` binding from the shell integration by setting
+`FZF_CTRL_R_COMMAND` to an empty string. Setting it to any other value is not
+supported and will result in a warning.
+
+```sh
+# Disable the CTRL-R binding from the shell integration
+FZF_CTRL_R_COMMAND= eval "$(fzf --bash)"
+```
+
+### 7. Added key support for `--bind`
+
+Pull request [#3996](https://github.com/junegunn/fzf/pull/3996) added support
+for many additional keys for `--bind` option, such as `ctrl-backspace`.
+
+### 8. Breaking changes
+
+#### Hiding the gutter column
+
+In the previous versions, the recommended way to hide the gutter column was to
+set `--color gutter:-1`. That's because the gutter column was just a space
+character, reversed. But now that it's using a visible character (`▌`), applying
+the default color is no longer enough to hide it. Instead, you can set it to
+a space character.
+
+```sh
+# Hide the gutter column
+fzf --gutter ' '
+
+# Classic style
+fzf --gutter ' ' --color gutter:reverse
+```
+
+#### `--color` option
+
+In the previous versions, some elements had default style attributes applied and
+you would have to explicitly unset them with `regular` attribute if you wanted
+to reset them. This is no longer needed now, as the default style attributes
+are applied only when you do not specify any color or style for that element.
+
+```sh
+# No 'dim', just red and italic.
+fzf --ghost 'Type to search' --color ghost:red:italic
+```
+
+#### Compatibility changes
+
+Starting with this release, fzf is built with Go 1.23. Support for some old OS versions has been dropped.
+
+See https://go.dev/wiki/MinimumRequirements.
+
 0.65.2
 ------
 - Bug fixes and improvements

Makefile

@@ -5,6 +5,15 @@ MAKEFILE       := $(realpath $(lastword $(MAKEFILE_LIST)))
 ROOT_DIR       := $(shell dirname $(MAKEFILE))
 SOURCES        := $(wildcard *.go src/*.go src/*/*.go shell/*sh man/man1/*.1) $(MAKEFILE)
 
+BASH_SCRIPTS   := $(ROOT_DIR)/bin/fzf-preview.sh \
+					$(ROOT_DIR)/bin/fzf-tmux \
+					$(ROOT_DIR)/install \
+					$(ROOT_DIR)/uninstall \
+					$(ROOT_DIR)/shell/common.sh \
+					$(ROOT_DIR)/shell/update.sh \
+					$(ROOT_DIR)/shell/completion.bash \
+					$(ROOT_DIR)/shell/key-bindings.bash
+
 ifdef FZF_VERSION
 VERSION        := $(FZF_VERSION)
 else
@@ -88,9 +97,14 @@ itest:
 bench:
 	cd src && SHELL=/bin/sh GOOS= $(GO) test -v -tags "$(TAGS)" -run=Bench -bench=. -benchmem
 
-lint: $(SOURCES) test/*.rb test/lib/*.rb
+lint: $(SOURCES) test/*.rb test/lib/*.rb ${BASH_SCRIPTS}
 	[ -z "$$(gofmt -s -d src)" ] || (gofmt -s -d src; exit 1)
 	bundle exec rubocop -a --require rubocop-minitest --require rubocop-performance
+	shell/update.sh --check ${BASH_SCRIPTS}
+
+fmt: $(SOURCES) $(BASH_SCRIPTS)
+	gofmt -s -w src
+	shell/update.sh ${BASH_SCRIPTS}
 
 install: bin/fzf
 
@@ -189,4 +203,4 @@ update:
 	$(GO) get -u
 	$(GO) mod tidy
 
-.PHONY: all generate build release test itest bench lint install clean docker docker-test update
+.PHONY: all generate build release test itest bench lint install clean docker docker-test update fmt

bin/fzf-preview.sh

@@ -49,7 +49,7 @@ if [[ ! $type =~ image/ ]]; then
 fi
 
 dim=${FZF_PREVIEW_COLUMNS}x${FZF_PREVIEW_LINES}
-if [[ $dim = x ]]; then
+if [[ $dim == x ]]; then
   dim=$(stty size < /dev/tty | awk '{print $2 "x" $1}')
 elif ! [[ $KITTY_WINDOW_ID ]] && ((FZF_PREVIEW_TOP + FZF_PREVIEW_LINES == $(stty size < /dev/tty | awk '{print $1}'))); then
   # Avoid scrolling issue when the Sixel image touches the bottom of the screen

bin/fzf-tmux

@@ -8,7 +8,7 @@ fail() {
 }
 
 fzf="$(command which fzf)" || fzf="$(dirname "$0")/fzf"
-[[ -x "$fzf" ]] || fail 'fzf executable not found'
+[[ -x $fzf ]] || fail 'fzf executable not found'
 
 args=()
 opt=""
@@ -16,8 +16,8 @@ skip=""
 swap=""
 close=""
 term=""
-[[ -n "$LINES" ]] && lines=$LINES || lines=$(tput lines) || lines=$(tmux display-message -p "#{pane_height}")
+[[ -n $LINES ]] && lines=$LINES || lines=$(tput lines) || lines=$(tmux display-message -p "#{pane_height}")
-[[ -n "$COLUMNS" ]] && columns=$COLUMNS || columns=$(tput cols) || columns=$(tmux display-message -p "#{pane_width}")
+[[ -n $COLUMNS ]] && columns=$COLUMNS || columns=$(tput cols) || columns=$(tmux display-message -p "#{pane_width}")
 
 tmux_version=$(tmux -V | sed 's/[^0-9.]//g')
 tmux_32=$(awk '{print ($1 >= 3.2)}' <<< "$tmux_version" 2> /dev/null || bc -l <<< "$tmux_version >= 3.2")
@@ -47,7 +47,7 @@ help() {
 while [[ $# -gt 0 ]]; do
   arg="$1"
   shift
-  [[ -z "$skip" ]] && case "$arg" in
+  [[ -z $skip ]] && case "$arg" in
     -)
       term=1
       ;;
@@ -59,18 +59,18 @@ while [[ $# -gt 0 ]]; do
       exit
       ;;
     -p* | -w* | -h* | -x* | -y* | -d* | -u* | -r* | -l*)
-      if [[ "$arg" =~ ^-[pwhxy] ]]; then
+      if [[ $arg =~ ^-[pwhxy] ]]; then
-        [[ "$opt" =~ "-E" ]] || opt="-E"
+        [[ $opt =~ "-E" ]] || opt="-E"
-      elif [[ "$arg" =~ ^.[lr] ]]; then
+      elif [[ $arg =~ ^.[lr] ]]; then
         opt="-h"
-        if [[ "$arg" =~ ^.l ]]; then
+        if [[ $arg =~ ^.l ]]; then
           opt="$opt -d"
           swap="; swap-pane -D ; select-pane -L"
           close="; tmux swap-pane -D"
         fi
       else
         opt=""
-        if [[ "$arg" =~ ^.u ]]; then
+        if [[ $arg =~ ^.u ]]; then
           opt="$opt -d"
           swap="; swap-pane -D ; select-pane -U"
           close="; tmux swap-pane -D"
@@ -79,7 +79,7 @@ while [[ $# -gt 0 ]]; do
       if [[ ${#arg} -gt 2 ]]; then
         size="${arg:2}"
       else
-        if [[ "$1" =~ ^[0-9%,]+$ ]] || [[ "$1" =~ ^[A-Z]$ ]]; then
+        if [[ $1 =~ ^[0-9%,]+$ ]] || [[ $1 =~ ^[A-Z]$ ]]; then
           size="$1"
           shift
         else
@@ -87,32 +87,32 @@ while [[ $# -gt 0 ]]; do
         fi
       fi
 
-      if [[ "$arg" =~ ^-p ]]; then
+      if [[ $arg =~ ^-p ]]; then
-        if [[ -n "$size" ]]; then
+        if [[ -n $size ]]; then
           w=${size%%,*}
           h=${size##*,}
           opt="$opt -w$w -h$h"
         fi
-      elif [[ "$arg" =~ ^-[whxy] ]]; then
+      elif [[ $arg =~ ^-[whxy] ]]; then
         opt="$opt ${arg:0:2}$size"
-      elif [[ "$size" =~ %$ ]]; then
+      elif [[ $size =~ %$ ]]; then
-        size=${size:0:((${#size}-1))}
+        size=${size:0:${#size}-1}
-        if [[ $tmux_32 = 1 ]]; then
+        if [[ $tmux_32 == 1 ]]; then
-          if [[ -n "$swap" ]]; then
+          if [[ -n $swap ]]; then
             opt="$opt -l $((100 - size))%"
           else
             opt="$opt -l $size%"
           fi
         else
-          if [[ -n "$swap" ]]; then
+          if [[ -n $swap ]]; then
             opt="$opt -p $((100 - size))"
           else
             opt="$opt -p $size"
           fi
         fi
       else
-        if [[ -n "$swap" ]]; then
+        if [[ -n $swap ]]; then
-          if [[ "$arg" =~ ^.l ]]; then
+          if [[ $arg =~ ^.l ]]; then
             max=$columns
           else
             max=$lines
@@ -135,10 +135,10 @@ while [[ $# -gt 0 ]]; do
       args+=("$arg")
       ;;
   esac
-  [[ -n "$skip" ]] && args+=("$arg")
+  [[ -n $skip ]] && args+=("$arg")
 done
 
-if [[ -z "$TMUX" ]]; then
+if [[ -z $TMUX ]]; then
   "$fzf" "${args[@]}"
   exit $?
 fi
@@ -149,7 +149,7 @@ fi
 args=("${args[@]}" "--no-height" "--bind=ctrl-z:ignore" "--no-tmux")
 
 # Handle zoomed tmux pane without popup options by moving it to a temp window
-if [[ ! "$opt" =~ "-E" ]] && tmux list-panes -F '#F' | grep -q Z; then
+if [[ ! $opt =~ "-E" ]] && tmux list-panes -F '#F' | grep -q Z; then
   zoomed_without_popup=1
   original_window=$(tmux display-message -p "#{window_id}")
   tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - '\\;' do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'")
@@ -175,12 +175,12 @@ cleanup() {
   \rm -f $argsf $fifo1 $fifo2 $fifo3
 
   # Restore tmux window options
-  if [[ "${#tmux_win_opts[@]}" -gt 1 ]]; then
+  if [[ ${#tmux_win_opts[@]} -gt 1 ]]; then
     eval "tmux ${tmux_win_opts[*]}"
   fi
 
   # Remove temp window if we were zoomed without popup options
-  if [[ -n "$zoomed_without_popup" ]]; then
+  if [[ -n $zoomed_without_popup ]]; then
     tmux display-message -p "#{window_id}" > /dev/null
     tmux swap-pane -t $original_window \; \
       select-window -t $original_window \; \
@@ -197,10 +197,10 @@ trap 'cleanup 1' SIGUSR1
 trap 'cleanup' EXIT
 
 envs="export TERM=$TERM "
-if [[ "$opt" =~ "-E" ]]; then
+if [[ $opt =~ "-E" ]]; then
-  if [[ $tmux_version = 3.2 ]]; then
+  if [[ $tmux_version == 3.2 ]]; then
     FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS"
-  elif [[ $tmux_32 = 1 ]]; then
+  elif [[ $tmux_32 == 1 ]]; then
     FZF_DEFAULT_OPTS="--border $FZF_DEFAULT_OPTS"
     opt="-B $opt"
   else
@@ -211,8 +211,8 @@ fi
 envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")"
 envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")"
 envs="$envs FZF_DEFAULT_OPTS_FILE=$(printf %q "$FZF_DEFAULT_OPTS_FILE")"
-[[ -n "$RUNEWIDTH_EASTASIAN" ]] && envs="$envs RUNEWIDTH_EASTASIAN=$(printf %q "$RUNEWIDTH_EASTASIAN")"
+[[ -n $RUNEWIDTH_EASTASIAN ]] && envs="$envs RUNEWIDTH_EASTASIAN=$(printf %q "$RUNEWIDTH_EASTASIAN")"
-[[ -n "$BAT_THEME" ]] && envs="$envs BAT_THEME=$(printf %q "$BAT_THEME")"
+[[ -n $BAT_THEME ]] && envs="$envs BAT_THEME=$(printf %q "$BAT_THEME")"
 echo "$envs;" > "$argsf"
 
 # Build arguments to fzf
@@ -224,9 +224,9 @@ close="; trap - EXIT SIGINT SIGTERM $close"
 
 export TMUX=$(cut -d , -f 1,2 <<< "$TMUX")
 mkfifo -m o+w $fifo2
-if [[ "$opt" =~ "-E" ]]; then
+if [[ $opt =~ "-E" ]]; then
   cat $fifo2 &
-  if [[ -n "$term" ]] || [[ -t 0 ]]; then
+  if [[ -n $term ]] || [[ -t 0 ]]; then
     cat <<< "\"$fzf\" $opts > $fifo2; out=\$? $close; exit \$out" >> $argsf
   else
     mkfifo $fifo1
@@ -239,7 +239,7 @@ if [[ "$opt" =~ "-E" ]]; then
 fi
 
 mkfifo -m o+w $fifo3
-if [[ -n "$term" ]] || [[ -t 0 ]]; then
+if [[ -n $term ]] || [[ -t 0 ]]; then
   cat <<< "\"$fzf\" $opts > $fifo2; echo \$? > $fifo3 $close" >> $argsf
 else
   mkfifo $fifo1
@@ -249,6 +249,9 @@ fi
 tmux \
   split-window -c "$PWD" $opt "bash -c 'exec -a fzf bash $argsf'" $swap \
   $tmux_off_opts \
-  > /dev/null 2>&1 || { "$fzf" "${args[@]}"; exit $?; }
+  > /dev/null 2>&1 || {
+  "$fzf" "${args[@]}"
+  exit $?
+}
 cat $fifo2
 exit "$(cat $fifo3)"

go.mod

@@ -1,20 +1,20 @@
 module github.com/junegunn/fzf
 
 require (
-	github.com/charlievieth/fastwalk v1.0.12
+	github.com/charlievieth/fastwalk v1.0.14
-	github.com/gdamore/tcell/v2 v2.8.1
+	github.com/gdamore/tcell/v2 v2.9.0
 	github.com/junegunn/go-shellwords v0.0.0-20250127100254-2aa3b3277741
 	github.com/mattn/go-isatty v0.0.20
 	github.com/rivo/uniseg v0.4.7
-	golang.org/x/sys v0.30.0
+	golang.org/x/sys v0.35.0
-	golang.org/x/term v0.29.0
+	golang.org/x/term v0.34.0
 )
 
 require (
 	github.com/gdamore/encoding v1.0.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 )
 
-go 1.20
+go 1.23.0

go.sum

@@ -1,10 +1,9 @@
-github.com/charlievieth/fastwalk v1.0.12 h1:pwfxe1LajixViQqo7EFLXU2+mQxb6OaO0CeNdVwRKTg=
+github.com/charlievieth/fastwalk v1.0.14 h1:3Eh5uaFGwHZd8EGwTjJnSpBkfwfsak9h6ICgnWlhAyg=
-github.com/charlievieth/fastwalk v1.0.12/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=
+github.com/charlievieth/fastwalk v1.0.14/go.mod h1:diVcUreiU1aQ4/Wu3NbxxH4/KYdKpLDojrQ1Bb2KgNY=
 github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
 github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU=
+github.com/gdamore/tcell/v2 v2.9.0 h1:N6t+eqK7/xwtRPwxzs1PXeRWnm0H9l02CrgJ7DLn1ys=
-github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw=
+github.com/gdamore/tcell/v2 v2.9.0/go.mod h1:8/ZoqM9rxzYphT9tH/9LnunhV9oPBqwS8WHGYm5nrmo=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/junegunn/go-shellwords v0.0.0-20250127100254-2aa3b3277741 h1:7dYDtfMDfKzjT+DVfIS4iqknSEKtZpEcXtu6vuaasHs=
 github.com/junegunn/go-shellwords v0.0.0-20250127100254-2aa3b3277741/go.mod h1:6EILKtGpo5t+KLb85LNZLAF6P9LKp78hJI80PXMcn3c=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -14,35 +13,20 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -50,38 +34,22 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.34.0 h1:O/2T7POpk0ZZ7MAzMeWFSg6S5IpWd/RXDlM9hgM3DR4=
-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.34.0/go.mod h1:5jC53AEywhIVebHgPVeg0mj8OD3VO9OzclacVrqpaAw=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

install

@@ -2,7 +2,7 @@
 
 set -u
 
-version=0.65.2
+version=0.66.0
 auto_completion=
 key_bindings=
 update_config=2
@@ -104,7 +104,7 @@ check_binary() {
 
 link_fzf_in_path() {
   if which_fzf="$(command -v fzf)"; then
-    echo "  - Found in \$PATH"
+    echo '  - Found in $PATH'
     echo "  - Creating symlink: bin/fzf -> $which_fzf"
     (cd "$fzf_base"/bin && rm -f fzf && ln -sf "$which_fzf" fzf)
     check_binary && return
@@ -215,7 +215,7 @@ if [ -n "$binary_error" ]; then
   fi
 fi
 
-[[ "$*" =~ "--bin" ]] && exit 0
+[[ $* =~ "--bin" ]] && exit 0
 
 for s in $shells; do
   if ! command -v "$s" > /dev/null; then
@@ -242,7 +242,7 @@ fi
 
 echo
 for shell in $shells; do
-  [[ "$shell" = fish ]] && continue
+  [[ $shell == fish ]] && continue
   src=${prefix_expand}.${shell}
   echo -n "Generate $src ... "
 
@@ -266,7 +266,7 @@ fi
 EOF
 
   if [[ $auto_completion -eq 1 ]] && [[ $key_bindings -eq 1 ]]; then
-    if [[ "$shell" = zsh ]]; then
+    if [[ $shell == zsh ]]; then
       echo "source <(fzf --$shell)" >> "$src"
     else
       echo "eval \"\$(fzf --$shell)\"" >> "$src"
@@ -286,7 +286,7 @@ EOF
 done
 
 # fish
-if [[ "$shells" =~ fish ]]; then
+if [[ $shells =~ fish ]]; then
   echo -n "Update fish_user_paths ... "
   fish << EOF
   echo \$fish_user_paths | \grep "$fzf_base"/bin > /dev/null
@@ -356,12 +356,12 @@ if [ $update_config -eq 2 ]; then
 fi
 echo
 for shell in $shells; do
-  [[ "$shell" = fish ]] && continue
+  [[ $shell == fish ]] && continue
   [ $shell = zsh ] && dest=${ZDOTDIR:-~}/.zshrc || dest=~/.bashrc
   append_line $update_config "[ -f ${prefix}.${shell} ] && source ${prefix}.${shell}" "$dest" "${prefix}.${shell}"
 done
 
-if [ $key_bindings -eq 1 ] && [[ "$shells" =~ fish ]]; then
+if [ $key_bindings -eq 1 ] && [[ $shells =~ fish ]]; then
   bind_file="${fish_dir}/functions/fish_user_key_bindings.fish"
   if [ ! -e "$bind_file" ]; then
     mkdir -p "${fish_dir}/functions"
@@ -386,13 +386,13 @@ fi
 
 if [ $update_config -eq 1 ]; then
   echo 'Finished. Restart your shell or reload config file.'
-  if [[ "$shells" =~ bash ]]; then
+  if [[ $shells =~ bash ]]; then
     echo -n '   source ~/.bashrc  # bash'
-    [[ "$archi" =~ Darwin ]] && echo -n '  (.bashrc should be loaded from .bash_profile)'
+    [[ $archi =~ Darwin ]] && echo -n '  (.bashrc should be loaded from .bash_profile)'
     echo
   fi
-  [[ "$shells" =~ zsh ]]  && echo "   source ${ZDOTDIR:-~}/.zshrc   # zsh"
+  [[ $shells =~ zsh ]] && echo "   source ${ZDOTDIR:-~}/.zshrc   # zsh"
-  [[ "$shells" =~ fish ]] && [ $key_bindings -eq 1 ] && echo '   fzf_key_bindings  # fish'
+  [[ $shells =~ fish ]] && [ $key_bindings -eq 1 ] && echo '   fzf_key_bindings  # fish'
   echo
   echo 'Use uninstall script to remove fzf.'
   echo

install.ps1

@@ -1,4 +1,4 @@
-$version="0.65.2"
+$version="0.66.0"
 
 $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition
 

main.go

@@ -11,7 +11,7 @@ import (
 	"github.com/junegunn/fzf/src/protector"
 )
 
-var version = "0.65"
+var version = "0.66"
 var revision = "devel"
 
 //go:embed shell/key-bindings.bash

man/man1/fzf-tmux.1

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf\-tmux 1 "Aug 2025" "fzf 0.65.2" "fzf\-tmux - open fzf in tmux split pane"
+.TH fzf\-tmux 1 "Oct 2025" "fzf 0.66.0" "fzf\-tmux - open fzf in tmux split pane"
 
 .SH NAME
 fzf\-tmux - open fzf in tmux split pane

man/man1/fzf.1

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ..
-.TH fzf 1 "Aug 2025" "fzf 0.65.2" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Oct 2025" "fzf 0.66.0" "fzf - a command-line fuzzy finder"
 
 .SH NAME
 fzf - a command-line fuzzy finder
@@ -246,11 +246,11 @@ color mappings. Each entry is separated by a comma and/or whitespaces.
 
 .RS
 .B BASE SCHEME:
-    (default: \fBdark\fR on 256-color terminal, otherwise \fB16\fR; If \fBNO_COLOR\fR is set, \fBbw\fR)
+    (default: \fBdark\fR on 256-color terminal, otherwise \fBbase16\fR; If \fBNO_COLOR\fR is set, \fBbw\fR)
 
-    \fBdark    \fRColor scheme for dark 256-color terminal
+    \fBdark    \fRColor scheme for dark terminal
-    \fBlight   \fRColor scheme for light 256-color terminal
+    \fBlight   \fRColor scheme for light terminal
-    \fB16      \fRColor scheme for 16-color terminal
+    \fBbase16  \fRColor scheme using base 16 colors (alias: \fB16\fR)
     \fBbw      \fRNo colors (equivalent to \fB\-\-no\-color\fR)
 
 .B COLOR NAMES:
@@ -299,6 +299,7 @@ color mappings. Each entry is separated by a comma and/or whitespaces.
     \fBheader (header\-fg)   \fRHeader
     \fBfooter (footer\-fg)   \fRFooter
     \fBnth                   \fRParts of the line specified by \fB\-\-nth\fR (only supports attributes)
+    \fBnomatch               \fRNon-matching items in raw mode (default: \fBdim\fR)
 
 .B ANSI COLORS:
     \fB\-1         \fRDefault terminal foreground/background color
@@ -324,7 +325,8 @@ color mappings. Each entry is separated by a comma and/or whitespaces.
     \fB#rrggbb    \fR24-bit colors
 
 .B ANSI ATTRIBUTES: (Only applies to foreground colors)
-    \fBregular    \fRClears previously set attributes; should precede the other ones
+    \fBregular        \fRClear previously set attributes; should precede the other ones
+    \fBstrip          \fRRemove colors
     \fBbold\fR
     \fBunderline\fR
     \fBreverse\fR
@@ -596,6 +598,9 @@ Indicator for wrapped lines. The default is '↳ ' or '> ' depending on
 .B "\-\-no\-multi\-line"
 Disable multi-line display of items when using \fB\-\-read0\fR
 .TP
+.B "\-\-raw"
+Enable raw mode where non-matching items are also displayed in a dimmed color.
+.TP
 .B "\-\-track"
 Make fzf track the current selection when the result list is updated.
 This can be useful when browsing logs using fzf with sorting disabled. It is
@@ -643,6 +648,9 @@ on the center of the screen.
 .BI "\-\-jump\-labels=" "CHARS"
 Label characters for \fBjump\fR mode.
 .TP
+.BI "\-\-gutter=" "CHAR"
+Character used for the gutter column (default: '▌' unless \fB\-\-no\-unicode\fR is given)
+.TP
 .BI "\-\-pointer=" "STR"
 Pointer to the current line (default: '▌' or '>' depending on \fB\-\-no\-unicode\fR)
 .TP
@@ -1125,19 +1133,25 @@ On Windows, the default value is \fBcmd /s/c\fR when \fB$SHELL\fR is not
 set.
 
 .TP
-.B "\-\-listen[=[ADDR:]PORT]" "\-\-listen\-unsafe[=[ADDR:]PORT]"
+.B "\-\-listen[=SOCKET_PATH|[ADDR:]PORT]" "\-\-listen\-unsafe[=[ADDR:]PORT]"
-Start HTTP server and listen on the given address. It allows external processes
+Start HTTP server and listen on the given address or Unix socket. It allows
-to send actions to perform via POST method.
+external processes to send actions to perform via POST method and query the
+program state via GET method. For the argument to be recognized as a socket
+path, it must have \fB.sock\fR extension.
 
 - If the port number is omitted or given as 0, fzf will automatically choose
-a port and export it as \fBFZF_PORT\fR environment variable to the child processes
+a port and export it as \fBFZF_PORT\fR environment variable to the child processes.
+
+- If a Unix socket path is given, fzf will create a Unix domain socket at the
+  given path. The existing file will be removed. The path to the socket file
+  is exported as \fBFZF_SOCK\fR environment variable.
 
 - If \fBFZF_API_KEY\fR environment variable is set, the server would require
-sending an API key with the same value in the \fBx\-api\-key\fR HTTP header
+  sending an API key with the same value in the \fBx\-api\-key\fR HTTP header.
 
-- \fBFZF_API_KEY\fR is required for a non-localhost listen address
+- \fBFZF_API_KEY\fR is required for a non-localhost listen address.
 
-- To allow remote process execution, use \fB\-\-listen\-unsafe\fR
+- To allow remote process execution, use \fB\-\-listen\-unsafe\fR.
 
 e.g.
      \fB# Start HTTP server on port 6266
@@ -1176,6 +1190,18 @@ e.g.
      '
      \fR
 
+Here is an example script that uses a Unix socket instead of a TCP port.
+
+    \fB
+    fzf --listen=/tmp/fzf.sock
+
+    # GET
+    curl --unix-socket /tmp/fzf.sock http
+
+    # POST
+    curl --unix-socket /tmp/fzf.sock http -d up
+    \fR
+
 .SS DIRECTORY TRAVERSAL
 .TP
 .B "\-\-walker=[file][,dir][,follow][,hidden]"
@@ -1327,6 +1353,8 @@ fzf exports the following environment variables to its child processes.
 .br
 .BR FZF_COLUMNS "         Number of columns fzf takes up excluding padding and margin"
 .br
+.BR FZF_DIRECTION "       Direction of the list (\fBup\fR or \fBdown\fR)"
+.br
 .BR FZF_TOTAL_COUNT "     Total number of items"
 .br
 .BR FZF_MATCH_COUNT "     Number of matched items"
@@ -1363,6 +1391,8 @@ fzf exports the following environment variables to its child processes.
 .br
 .BR FZF_PORT "            Port number when \-\-listen option is used"
 .br
+.BR FZF_SOCK "            Unix socket path when \-\-listen option is used"
+.br
 .BR FZF_PREVIEW_TOP "     Top position of the preview window"
 .br
 .BR FZF_PREVIEW_LEFT "    Left position of the preview window"
@@ -1370,6 +1400,8 @@ fzf exports the following environment variables to its child processes.
 .BR FZF_PREVIEW_LINES "   Number of lines in the preview window"
 .br
 .BR FZF_PREVIEW_COLUMNS " Number of columns in the preview window"
+.br
+.BR FZF_RAW "             Only in raw mode. 1 if the current item matches, 0 otherwise"
 
 .SH EXTENDED SEARCH MODE
 
@@ -1473,12 +1505,22 @@ e.g.
 .br
 \fIalt\-right\fR
 .br
+\fIalt\-home\fR
+.br
+\fIalt\-end\fR
+.br
+\fIalt\-backspace\fR  (\fIalt\-bspace\fR \fIalt\-bs\fR)
+.br
+\fIalt\-delete\fR
+.br
+\fIalt\-page\-up\fR
+.br
+\fIalt\-page\-down\fR
+.br
 \fIalt\-enter\fR
 .br
 \fIalt\-space\fR
 .br
-\fIalt\-backspace\fR  (\fIalt\-bspace\fR \fIalt\-bs\fR)
-.br
 \fItab\fR
 .br
 \fIshift\-tab\fR      (\fIbtab\fR)
@@ -1505,6 +1547,26 @@ e.g.
 .br
 \fIpage\-down\fR      (\fIpgdn\fR)
 .br
+\fIctrl\-up\fR
+.br
+\fIctrl\-down\fR
+.br
+\fIctrl\-left\fR
+.br
+\fIctrl\-right\fR
+.br
+\fIctrl\-home\fR
+.br
+\fIctrl\-end\fR
+.br
+\fIctrl\-backspace\fR  (\fIctrl\-bspace\fR \fIctrl\-bs\fR)
+.br
+\fIctrl\-delete\fR
+.br
+\fIctrl\-page\-up\fR
+.br
+\fIctrl\-page\-down\fR
+.br
 \fIshift\-up\fR
 .br
 \fIshift\-down\fR
@@ -1513,8 +1575,16 @@ e.g.
 .br
 \fIshift\-right\fR
 .br
+\fIshift\-home\fR
+.br
+\fIshift\-end\fR
+.br
 \fIshift\-delete\fR
 .br
+\fIshift\-page\-up\fR
+.br
+\fIshift\-page\-down\fR
+.br
 \fIalt\-shift\-up\fR
 .br
 \fIalt\-shift\-down\fR
@@ -1523,6 +1593,72 @@ e.g.
 .br
 \fIalt\-shift\-right\fR
 .br
+\fIalt\-shift\-home\fR
+.br
+\fIalt\-shift\-end\fR
+.br
+\fIalt\-shift\-delete\fR
+.br
+\fIalt\-shift\-page\-up\fR
+.br
+\fIalt\-shift\-page\-down\fR
+.br
+\fIctrl\-alt\-up\fR
+.br
+\fIctrl\-alt\-down\fR
+.br
+\fIctrl\-alt\-left\fR
+.br
+\fIctrl\-alt\-right\fR
+.br
+\fIctrl\-alt\-home\fR
+.br
+\fIctrl\-alt\-end\fR
+.br
+\fIctrl\-alt\-backspace\fR  (\fIctrl\-alt\-bspace\fR \fIctrl\-alt\-bs\fR)
+.br
+\fIctrl\-alt\-delete\fR
+.br
+\fIctrl\-alt\-page\-up\fR
+.br
+\fIctrl\-alt\-page\-down\fR
+.br
+\fIctrl\-shift\-up\fR
+.br
+\fIctrl\-shift\-down\fR
+.br
+\fIctrl\-shift\-left\fR
+.br
+\fIctrl\-shift\-right\fR
+.br
+\fIctrl\-shift\-home\fR
+.br
+\fIctrl\-shift\-end\fR
+.br
+\fIctrl\-shift\-delete\fR
+.br
+\fIctrl\-shift\-page\-up\fR
+.br
+\fIctrl\-shift\-page\-down\fR
+.br
+\fIctrl\-alt\-shift\-up\fR
+.br
+\fIctrl\-alt\-shift\-down\fR
+.br
+\fIctrl\-alt\-shift\-left\fR
+.br
+\fIctrl\-alt\-shift\-right\fR
+.br
+\fIctrl\-alt\-shift\-home\fR
+.br
+\fIctrl\-alt\-shift\-end\fR
+.br
+\fIctrl\-alt\-shift\-delete\fR
+.br
+\fIctrl\-alt\-shift\-page\-up\fR
+.br
+\fIctrl\-alt\-shift\-page\-down\fR
+.br
 \fIleft\-click\fR
 .br
 \fIright\-click\fR
@@ -1547,6 +1683,8 @@ e.g.
 .br
 or any single character
 
+Note that some terminal emulators may not support \fIctrl-*\fR bindings.
+
 .SS AVAILABLE EVENTS:
 \fIstart\fR
 .RS
@@ -1699,13 +1837,16 @@ A key or an event can be bound to one or more of the following actions.
     \fBaccept\-non\-empty\fR             (same as \fBaccept\fR except that it prevents fzf from exiting without selection)
     \fBaccept\-or\-print\-query\fR        (same as \fBaccept\fR except that it prints the query when there's no match)
     \fBbackward\-char\fR                \fIctrl\-b  left\fR
-    \fBbackward\-delete\-char\fR         \fIctrl\-h  bspace\fR
+    \fBbackward\-delete\-char\fR         \fIctrl\-h ctrl\-bspace bspace\fR
     \fBbackward\-delete\-char/eof\fR     (same as \fBbackward\-delete\-char\fR except aborts fzf if query is empty)
+    \fBbackward\-kill\-subword\fR
     \fBbackward\-kill\-word\fR           \fIalt\-bs\fR
+    \fBbackward\-subword\fR
     \fBbackward\-word\fR                \fIalt\-b   shift\-left\fR
     \fBbecome(...)\fR                  (replace fzf process with the specified command; see below for the details)
     \fBbeginning\-of\-line\fR            \fIctrl\-a  home\fR
     \fBbell\fR                         (ring the terminal bell)
+    \fBbest\fR                         (move to the best match; same as \fBfirst\fR if raw mode is disabled)
     \fBbg\-cancel\fR                    (cancel background transform processes)
     \fBcancel\fR                       (clear query string if not empty, abort fzf otherwise)
     \fBchange\-border\-label(...)\fR     (change \fB\-\-border\-label\fR to the given string)
@@ -1730,9 +1871,13 @@ A key or an event can be bound to one or more of the following actions.
     \fBdelete\-char\fR                  \fIdel\fR
     \fBdelete\-char/eof\fR              \fIctrl\-d\fR (same as \fBdelete\-char\fR except aborts fzf if query is empty)
     \fBdeselect\fR
-    \fBdeselect\-all\fR                 (deselect all matches; to also clear non-matched selections, use \fBclear\-multi\fR)
+    \fBdeselect\-all\fR                 (deselect all matches; to also clear non-matching selections, use \fBclear\-multi\fR)
+    \fBdisable\-raw\fR                  (disable raw mode)
     \fBdisable\-search\fR               (disable search functionality)
-    \fBdown\fR                         \fIctrl\-j  ctrl\-n  down\fR
+    \fBdown\fR                         \fIctrl\-j  down\fR
+    \fBdown\-match\fR                   \fIctrl\-n\fR  \fIalt\-down\fR (move to the match below the cursor)
+    \fBdown\-selected\fR                (move to the selected item below the cursor)
+    \fBenable\-raw\fR                   (enable raw mode)
     \fBenable\-search\fR                (enable search functionality)
     \fBend\-of\-line\fR                  \fIctrl\-e  end\fR
     \fBexclude\fR                      (exclude the current item from the result)
@@ -1741,14 +1886,16 @@ A key or an event can be bound to one or more of the following actions.
     \fBexecute\-silent(...)\fR          (see below for the details)
     \fBfirst\fR                        (move to the first match; same as \fBpos(1)\fR)
     \fBforward\-char\fR                 \fIctrl\-f  right\fR
+    \fBforward\-subword\fR
     \fBforward\-word\fR                 \fIalt\-f   shift\-right\fR
     \fBignore\fR
     \fBjump\fR                         (EasyMotion-like 2-keystroke movement)
     \fBkill\-line\fR
+    \fBkill\-subword\fR
     \fBkill\-word\fR                    \fIalt\-d\fR
     \fBlast\fR                         (move to the last match; same as \fBpos(\-1)\fR)
     \fBnext\-history\fR                 (\fIctrl\-n\fR on \fB\-\-history\fR)
-    \fBnext\-selected\fR                (move to the next selected item)
+    \fBnext\-selected\fR                (synonym to \fBdown\-selected\fR)
     \fBpage\-down\fR                    \fIpgdn\fR
     \fBpage\-up\fR                      \fIpgup\fR
     \fBhalf\-page\-down\fR
@@ -1761,7 +1908,7 @@ A key or an event can be bound to one or more of the following actions.
     \fBoffset\-middle\fR                (place the current item is in the middle of the screen)
     \fBpos(...)\fR                     (move cursor to the numeric position; negative number to count from the end)
     \fBprev\-history\fR                 (\fIctrl\-p\fR on \fB\-\-history\fR)
-    \fBprev\-selected\fR                (move to the previous selected item)
+    \fBprev\-selected\fR                (synonym to \fBup\-selected\fR)
     \fBpreview(...)\fR                 (see below for the details)
     \fBpreview\-down\fR                 \fIshift\-down\fR
     \fBpreview\-up\fR                   \fIshift\-up\fR
@@ -1796,6 +1943,7 @@ A key or an event can be bound to one or more of the following actions.
     \fBtoggle\-multi\-line\fR
     \fBtoggle\-preview\fR
     \fBtoggle\-preview\-wrap\fR
+    \fBtoggle\-raw\fR                   (toggle raw mode for displaying non-matching items)
     \fBtoggle\-search\fR                (toggle search functionality)
     \fBtoggle\-sort\fR
     \fBtoggle\-track\fR                 (toggle global tracking option (\fB\-\-track\fR))
@@ -1822,7 +1970,9 @@ A key or an event can be bound to one or more of the following actions.
     \fBunix\-line\-discard\fR            \fIctrl\-u\fR
     \fBunix\-word\-rubout\fR             \fIctrl\-w\fR
     \fBuntrack\-current\fR              (stop tracking the current item; no-op if global tracking is enabled)
-    \fBup\fR                           \fIctrl\-k  ctrl\-p  up\fR
+    \fBup\fR                           \fIctrl\-k  up\fR
+    \fBup\-match\fR                     \fIctrl\-p\fR  \fIalt\-up\fR (move to the match above the cursor)
+    \fBup\-selected\fR                  (move to the selected item above the cursor)
     \fByank\fR                         \fIctrl\-y\fR
 
 Each \fBtransform*\fR action has a corresponding \fBbg\-transform*\fR

shell/common.sh

@@ -1,4 +1,3 @@
-
 __fzf_defaults() {
   # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
   # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS

shell/completion.bash

@@ -31,9 +31,10 @@ if [[ $- =~ i ]]; then
 
 ###########################################################
 
+#----BEGIN shfmt
 #----BEGIN INCLUDE common.sh
 # NOTE: Do not directly edit this section, which is copied from "common.sh".
-# To modify it, one can edit "common.sh" and run "./update-common.sh" to apply
+# To modify it, one can edit "common.sh" and run "./update.sh" to apply
 # the changes. See code comments in "common.sh" for the implementation details.
 
 __fzf_defaults() {
@@ -58,9 +59,9 @@ __fzf_exec_awk() {
 #----END INCLUDE
 
 __fzf_comprun() {
-  if [[ "$(type -t _fzf_comprun 2>&1)" = function ]]; then
+  if [[ "$(type -t _fzf_comprun 2>&1)" == function ]]; then
     _fzf_comprun "$@"
-  elif [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; }; then
+  elif [[ -n ${TMUX_PANE-} ]] && { [[ ${FZF_TMUX:-0} != 0 ]] || [[ -n ${FZF_TMUX_OPTS-} ]]; }; then
     shift
     fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- "$@"
   else
@@ -72,13 +73,13 @@ __fzf_comprun() {
 __fzf_orig_completion() {
   local l comp f cmd
   while read -r l; do
-    if [[ "$l" =~ ^(.*\ -F)\ *([^ ]*).*\ ([^ ]*)$ ]]; then
+    if [[ $l =~ ^(.*\ -F)\ *([^ ]*).*\ ([^ ]*)$ ]]; then
       comp="${BASH_REMATCH[1]}"
       f="${BASH_REMATCH[2]}"
       cmd="${BASH_REMATCH[3]}"
-      [[ "$f" = _fzf_* ]] && continue
+      [[ $f == _fzf_* ]] && continue
       printf -v "_fzf_orig_completion_${cmd//[^A-Za-z0-9_]/_}" "%s" "${comp} %s ${cmd} #${f}"
-      if [[ "$l" = *" -o nospace "* ]] && [[ ! "${__fzf_nospace_commands-}" = *" $cmd "* ]]; then
+      if [[ $l == *" -o nospace "* ]] && [[ ${__fzf_nospace_commands-} != *" $cmd "* ]]; then
         __fzf_nospace_commands="${__fzf_nospace_commands-} $cmd "
       fi
     fi
@@ -257,7 +258,7 @@ _fzf_opts_completion() {
       ;;
   esac
 
-  if [[ "$cur" =~ ^-|\+ ]]; then
+  if [[ $cur =~ ^-|\+ ]]; then
     COMPREPLY=($(compgen -W "${opts}" -- "$cur"))
     return 0
   fi
@@ -272,7 +273,7 @@ _fzf_handle_dynamic_completion() {
   orig_cmd="$1"
   if __fzf_orig_completion_get_orig_func "$cmd"; then
     "$REPLY" "$@"
-  elif [[ -n "${_fzf_completion_loader-}" ]]; then
+  elif [[ -n ${_fzf_completion_loader-} ]]; then
     orig_complete=$(complete -p "$orig_cmd" 2> /dev/null)
     $_fzf_completion_loader "$@"
     ret=$?
@@ -286,7 +287,7 @@ _fzf_handle_dynamic_completion() {
         __fzf_orig_completion_instantiate "$cmd" "${BASH_REMATCH[1]}" &&
         orig_complete=$REPLY
 
-      if [[ "${__fzf_nospace_commands-}" = *" $orig_cmd "* ]]; then
+      if [[ ${__fzf_nospace_commands-} == *" $orig_cmd "* ]]; then
         eval "${orig_complete/ -F / -o nospace -F }"
       else
         eval "$orig_complete"
@@ -306,18 +307,18 @@ __fzf_generic_path_completion() {
   COMPREPLY=()
   trigger=${FZF_COMPLETION_TRIGGER-'**'}
   [[ $COMP_CWORD -ge 0 ]] && cur="${COMP_WORDS[COMP_CWORD]}"
-  if [[ "$cur" == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then
+  if [[ $cur == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then
     base=${cur:0:${#cur}-${#trigger}}
     eval "base=$base" 2> /dev/null || return
 
     dir=
-    [[ $base = *"/"* ]] && dir="$base"
+    [[ $base == *"/"* ]] && dir="$base"
     while true; do
-      if [[ -z "$dir" ]] || [[ -d "$dir" ]]; then
+      if [[ -z $dir ]] || [[ -d $dir ]]; then
-        leftover=${base/#"$dir"}
+        leftover=${base/#"$dir"/}
-        leftover=${leftover/#\/}
+        leftover=${leftover/#\//}
-        [[ -z "$dir" ]] && dir='.'
+        [[ -z $dir ]] && dir='.'
-        [[ "$dir" != "/" ]] && dir="${dir/%\//}"
+        [[ $dir != "/" ]] && dir="${dir/%\//}"
         matches=$(
           export FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --scheme=path" "${FZF_COMPLETION_OPTS-} $2")
           unset FZF_DEFAULT_COMMAND FZF_DEFAULT_OPTS_FILE
@@ -337,8 +338,8 @@ __fzf_generic_path_completion() {
           done
         )
         matches=${matches% }
-        [[ -z "$3" ]] && [[ "${__fzf_nospace_commands-}" = *" ${COMP_WORDS[0]} "* ]] && matches="$matches "
+        [[ -z $3 ]] && [[ ${__fzf_nospace_commands-} == *" ${COMP_WORDS[0]} "* ]] && matches="$matches "
-        if [[ -n "$matches" ]]; then
+        if [[ -n $matches ]]; then
           COMPREPLY=("$matches")
         else
           COMPREPLY=("$cur")
@@ -349,7 +350,7 @@ __fzf_generic_path_completion() {
         return 0
       fi
       dir=$(command dirname "$dir")
-      [[ "$dir" =~ /$ ]] || dir="$dir"/
+      [[ $dir =~ /$ ]] || dir="$dir"/
     done
   else
     shift
@@ -365,15 +366,15 @@ _fzf_complete() {
   args=("$@")
   sep=
   for i in "${!args[@]}"; do
-    if [[ "${args[$i]}" = -- ]]; then
+    if [[ ${args[$i]} == -- ]]; then
       sep=$i
       break
     fi
   done
-  if [[ -n "$sep" ]]; then
+  if [[ -n $sep ]]; then
     str_arg=
     rest=("${args[@]:$((sep + 1)):${#args[@]}}")
-    args=("${args[@]:0:$sep}")
+    args=("${args[@]:0:sep}")
   else
     str_arg=$1
     args=()
@@ -388,15 +389,16 @@ _fzf_complete() {
   trigger=${FZF_COMPLETION_TRIGGER-'**'}
   cmd="${COMP_WORDS[0]}"
   cur="${COMP_WORDS[COMP_CWORD]}"
-  if [[ "$cur" == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then
+  if [[ $cur == *"$trigger" ]] && [[ $cur != *'$('* ]] && [[ $cur != *':='* ]] && [[ $cur != *'`'* ]]; then
     cur=${cur:0:${#cur}-${#trigger}}
 
     selected=$(
       FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse" "${FZF_COMPLETION_OPTS-} $str_arg") \
       FZF_DEFAULT_OPTS_FILE='' \
-        __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | eval "$post" | command tr '\n' ' ')
+        __fzf_comprun "${rest[0]}" "${args[@]}" -q "$cur" | eval "$post" | command tr '\n' ' '
+    )
     selected=${selected% } # Strip trailing space not to repeat "-o nospace"
-    if [[ -n "$selected" ]]; then
+    if [[ -n $selected ]]; then
       COMPREPLY=("$selected")
     else
       COMPREPLY=("$cur")
@@ -545,7 +547,7 @@ _fzf_complete_ssh() {
       ;;
     *)
       local user=
-      [[ "$2" =~ '@' ]] && user="${2%%@*}@"
+      [[ $2 =~ '@' ]] && user="${2%%@*}@"
       _fzf_complete +m -- "$@" < <(__fzf_list_hosts | __fzf_exec_awk -v user="$user" '{print user $0}')
       ;;
   esac
@@ -683,5 +685,6 @@ _fzf_setup_completion() {
     esac
   done
 }
+#----END shfmt
 
 fi

shell/completion.zsh

@@ -98,7 +98,7 @@ if [[ -o interactive ]]; then
 
 #----BEGIN INCLUDE common.sh
 # NOTE: Do not directly edit this section, which is copied from "common.sh".
-# To modify it, one can edit "common.sh" and run "./update-common.sh" to apply
+# To modify it, one can edit "common.sh" and run "./update.sh" to apply
 # the changes. See code comments in "common.sh" for the implementation details.
 
 __fzf_defaults() {

shell/key-bindings.bash

@@ -7,6 +7,7 @@
 # - $FZF_TMUX_OPTS
 # - $FZF_CTRL_T_COMMAND
 # - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_COMMAND
 # - $FZF_CTRL_R_OPTS
 # - $FZF_ALT_C_COMMAND
 # - $FZF_ALT_C_OPTS
@@ -17,9 +18,10 @@ if [[ $- =~ i ]]; then
 # Key bindings
 # ------------
 
+#----BEGIN shfmt
 #----BEGIN INCLUDE common.sh
 # NOTE: Do not directly edit this section, which is copied from "common.sh".
-# To modify it, one can edit "common.sh" and run "./update-common.sh" to apply
+# To modify it, one can edit "common.sh" and run "./update.sh" to apply
 # the changes. See code comments in "common.sh" for the implementation details.
 
 __fzf_defaults() {
@@ -53,13 +55,13 @@ __fzf_select__() {
 }
 
 __fzfcmd() {
-  [[ -n "${TMUX_PANE-}" ]] && { [[ "${FZF_TMUX:-0}" != 0 ]] || [[ -n "${FZF_TMUX_OPTS-}" ]]; } &&
+  [[ -n ${TMUX_PANE-} ]] && { [[ ${FZF_TMUX:-0} != 0 ]] || [[ -n ${FZF_TMUX_OPTS-} ]]; } &&
     echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
 }
 
 fzf-file-widget() {
   local selected="$(__fzf_select__ "$@")"
-  READLINE_LINE="${READLINE_LINE:0:$READLINE_POINT}$selected${READLINE_LINE:$READLINE_POINT}"
+  READLINE_LINE="${READLINE_LINE:0:READLINE_POINT}$selected${READLINE_LINE:READLINE_POINT}"
   READLINE_POINT=$((READLINE_POINT + ${#selected}))
 }
 
@@ -80,11 +82,11 @@ if command -v perl > /dev/null; then
       set +o pipefail
       builtin fc -lnr -2147483648 |
         last_hist=$(HISTTIMEFORMAT='' builtin history 1) command perl -n -l0 -e "$script" |
-        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"$'\t'"↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} +m --read0") \
+        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '"$'\t'"↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} +m --read0") \
         FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) --query "$READLINE_LINE"
     ) || return
     READLINE_LINE=$(command perl -pe 's/^\d*\t//' <<< "$output")
-    if [[ -z "$READLINE_POINT" ]]; then
+    if [[ -z $READLINE_POINT ]]; then
       echo "$READLINE_LINE"
     else
       READLINE_POINT=0x7fffffff
@@ -103,11 +105,11 @@ else # awk - fallback for POSIX systems
       set +o pipefail
       builtin fc -lnr -2147483648 2> /dev/null | # ( $'\t '<lines>$'\n' )* ; <lines> ::= [^\n]* ( $'\n'<lines> )*
         __fzf_exec_awk "$script" |               # ( <counter>$'\t'<lines>$'\000' )*
-        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"$'\t'"↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} +m --read0") \
+        FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '"$'\t'"↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} +m --read0") \
         FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) --query "$READLINE_LINE"
     ) || return
     READLINE_LINE=${output#*$'\t'}
-    if [[ -z "$READLINE_POINT" ]]; then
+    if [[ -z $READLINE_POINT ]]; then
       echo "$READLINE_LINE"
     else
       READLINE_POINT=0x7fffffff
@@ -124,35 +126,46 @@ bind -m emacs-standard '"\C-z": vi-editing-mode'
 
 if ((BASH_VERSINFO[0] < 4)); then
   # CTRL-T - Paste the selected file path into the command line
-  if [[ "${FZF_CTRL_T_COMMAND-x}" != "" ]]; then
+  if [[ ${FZF_CTRL_T_COMMAND-x} != "" ]]; then
     bind -m emacs-standard '"\C-t": " \C-b\C-k \C-u`__fzf_select__`\e\C-e\er\C-a\C-y\C-h\C-e\e \C-y\ey\C-x\C-x\C-f\C-y\ey\C-_"'
     bind -m vi-command '"\C-t": "\C-z\C-t\C-z"'
     bind -m vi-insert '"\C-t": "\C-z\C-t\C-z"'
   fi
 
   # CTRL-R - Paste the selected command from history into the command line
+  if [[ ${FZF_CTRL_R_COMMAND-x} != "" ]]; then
+    if [[ -n ${FZF_CTRL_R_COMMAND-} ]]; then
+      echo "warning: FZF_CTRL_R_COMMAND is set to a custom command, but custom commands are not yet supported for CTRL-R" >&2
+    fi
     bind -m emacs-standard '"\C-r": "\C-e \C-u\C-y\ey\C-u`__fzf_history__`\e\C-e\er"'
     bind -m vi-command '"\C-r": "\C-z\C-r\C-z"'
     bind -m vi-insert '"\C-r": "\C-z\C-r\C-z"'
+  fi
 else
   # CTRL-T - Paste the selected file path into the command line
-  if [[ "${FZF_CTRL_T_COMMAND-x}" != "" ]]; then
+  if [[ ${FZF_CTRL_T_COMMAND-x} != "" ]]; then
     bind -m emacs-standard -x '"\C-t": fzf-file-widget'
     bind -m vi-command -x '"\C-t": fzf-file-widget'
     bind -m vi-insert -x '"\C-t": fzf-file-widget'
   fi
 
   # CTRL-R - Paste the selected command from history into the command line
+  if [[ ${FZF_CTRL_R_COMMAND-x} != "" ]]; then
+    if [[ -n ${FZF_CTRL_R_COMMAND-} ]]; then
+      echo "warning: FZF_CTRL_R_COMMAND is set to a custom command, but custom commands are not yet supported for CTRL-R" >&2
+    fi
     bind -m emacs-standard -x '"\C-r": __fzf_history__'
     bind -m vi-command -x '"\C-r": __fzf_history__'
     bind -m vi-insert -x '"\C-r": __fzf_history__'
   fi
+fi
 
 # ALT-C - cd into the selected directory
-if [[ "${FZF_ALT_C_COMMAND-x}" != "" ]]; then
+if [[ ${FZF_ALT_C_COMMAND-x} != "" ]]; then
   bind -m emacs-standard '"\ec": " \C-b\C-k \C-u`__fzf_cd__`\e\C-e\er\C-m\C-y\C-h\e \C-y\ey\C-x\C-x\C-d\C-y\ey\C-_"'
   bind -m vi-command '"\ec": "\C-z\ec\C-z"'
   bind -m vi-insert '"\ec": "\C-z\ec\C-z"'
 fi
+#----END shfmt
 
 fi

shell/key-bindings.fish

@@ -7,6 +7,7 @@
 # - $FZF_TMUX_OPTS
 # - $FZF_CTRL_T_COMMAND
 # - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_COMMAND
 # - $FZF_CTRL_R_OPTS
 # - $FZF_ALT_C_COMMAND
 # - $FZF_ALT_C_OPTS
@@ -159,7 +160,7 @@ function fzf_key_bindings
     set -lx FZF_DEFAULT_OPTS (__fzf_defaults '' \
       '--nth=2..,.. --scheme=history --multi --wrap-sign="\t↳ "' \
       '--bind=\'shift-delete:execute-silent(eval history delete --exact --case-sensitive -- (string escape -n -- {+} | string replace -r -a "^\d*\\\\\\t|(?<=\\\\\\n)\\\\\\t" ""))+reload(eval $FZF_DEFAULT_COMMAND)\'' \
-      "--bind=ctrl-r:toggle-sort --highlight-line $FZF_CTRL_R_OPTS" \
+      "--bind=ctrl-r:toggle-sort,alt-r:toggle-raw --highlight-line $FZF_CTRL_R_OPTS" \
       '--accept-nth=2.. --read0 --print0 --with-shell='(status fish-path)\\ -c)
 
     set -lx FZF_DEFAULT_OPTS_FILE
@@ -214,8 +215,13 @@ function fzf_key_bindings
     commandline -f repaint
   end
 
+  if not set -q FZF_CTRL_R_COMMAND; or test -n "$FZF_CTRL_R_COMMAND"
+    if test -n "$FZF_CTRL_R_COMMAND"
+      echo "warning: FZF_CTRL_R_COMMAND is set to a custom command, but custom commands are not yet supported for CTRL-R" >&2
+    end
     bind \cr fzf-history-widget
     bind -M insert \cr fzf-history-widget
+  end
 
   if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
     bind \ct fzf-file-widget

shell/key-bindings.zsh

@@ -7,6 +7,7 @@
 # - $FZF_TMUX_OPTS
 # - $FZF_CTRL_T_COMMAND
 # - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_COMMAND
 # - $FZF_CTRL_R_OPTS
 # - $FZF_ALT_C_COMMAND
 # - $FZF_ALT_C_OPTS
@@ -40,7 +41,7 @@ if [[ -o interactive ]]; then
 
 #----BEGIN INCLUDE common.sh
 # NOTE: Do not directly edit this section, which is copied from "common.sh".
-# To modify it, one can edit "common.sh" and run "./update-common.sh" to apply
+# To modify it, one can edit "common.sh" and run "./update.sh" to apply
 # the changes. See code comments in "common.sh" for the implementation details.
 
 __fzf_defaults() {
@@ -132,11 +133,11 @@ fzf-history-widget() {
   if zmodload -F zsh/parameter p:{commands,history} 2>/dev/null && (( ${+commands[perl]} )); then
     selected="$(printf '%s\t%s\000' "${(kv)history[@]}" |
       perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\t(.*)/s, $1)}++) { s/\n/\n\t/g; print; }' |
-      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \
+      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \
       FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))"
   else
     selected="$(fc -rl 1 | __fzf_exec_awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' |
-      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \
+      FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,alt-r:toggle-raw --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \
       FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))"
   fi
   local ret=$?
@@ -150,11 +151,16 @@ fzf-history-widget() {
   zle reset-prompt
   return $ret
 }
+if [[ ${FZF_CTRL_R_COMMAND-x} != "" ]]; then
+  if [[ -n ${FZF_CTRL_R_COMMAND-} ]]; then
+    echo "warning: FZF_CTRL_R_COMMAND is set to a custom command, but custom commands are not yet supported for CTRL-R" >&2
+  fi
   zle     -N            fzf-history-widget
   bindkey -M emacs '^R' fzf-history-widget
   bindkey -M vicmd '^R' fzf-history-widget
   bindkey -M viins '^R' fzf-history-widget
 fi
+fi
 
 } always {
   eval $__fzf_key_bindings_options

shell/update-common.sh

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# This script applies the contents of "common.sh" to the other files.
-
-set -e
-
-# Go to the directory that contains this script
-dir=${0%"${0##*/}"}
-if [ -n "$dir" ]; then
-  cd "$dir"
-fi
-
-update() {
-  {
-    sed -n '1,/^#----BEGIN INCLUDE common\.sh/p' "$1"
-    cat <<EOF
-# NOTE: Do not directly edit this section, which is copied from "common.sh".
-# To modify it, one can edit "common.sh" and run "./update-common.sh" to apply
-# the changes. See code comments in "common.sh" for the implementation details.
-EOF
-    grep -v '^[[:blank:]]*#' common.sh # remove code comments in common.sh
-    sed -n '/^#----END INCLUDE/,$p' "$1"
-  } > "$1.part"
-
-  mv -f "$1.part" "$1"
-}
-
-update completion.bash
-update completion.zsh
-update key-bindings.bash
-update key-bindings.zsh

shell/update.sh

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+# This script applies the contents of "common.sh" to the other files.
+
+set -e
+
+dir=${0%"${0##*/}"}
+
+update() {
+  {
+    sed -n '1,/^#----BEGIN INCLUDE common\.sh/p' "$1"
+    cat << EOF
+# NOTE: Do not directly edit this section, which is copied from "common.sh".
+# To modify it, one can edit "common.sh" and run "./update.sh" to apply
+# the changes. See code comments in "common.sh" for the implementation details.
+EOF
+    echo
+    grep -v '^[[:blank:]]*#' "$dir/common.sh" # remove code comments in common.sh
+    sed -n '/^#----END INCLUDE/,$p' "$1"
+  } > "$1.part"
+
+  mv -f "$1.part" "$1"
+}
+
+update "$dir/completion.bash"
+update "$dir/completion.zsh"
+update "$dir/key-bindings.bash"
+update "$dir/key-bindings.zsh"
+
+# Check if --check is in ARGV
+check=0
+rest=()
+for arg in "$@"; do
+  case $arg in
+    --check) check=1 ;;
+    *) rest+=("$arg") ;;
+  esac
+done
+
+fmt() {
+  if ! grep -q "^#----BEGIN shfmt" "$1"; then
+    if [[ $check == 1 ]]; then
+      shfmt -d "$1"
+      return $?
+    else
+      shfmt -w "$1"
+    fi
+  else
+    {
+      sed -n '1,/^#----BEGIN shfmt/p' "$1" | sed '$d'
+      sed -n '/^#----BEGIN shfmt/,/^#----END shfmt/p' "$1" | shfmt --filename "$1"
+      sed -n '/^#----END shfmt/,$p' "$1" | sed '1d'
+    } > "$1.part"
+
+    if [[ $check == 1 ]]; then
+      diff -q "$1" "$1.part"
+      ret=$?
+      rm -f "$1.part"
+      return $ret
+    fi
+
+    mv -f "$1.part" "$1"
+  fi
+}
+
+for file in "${rest[@]}"; do
+  fmt "$file" || exit $?
+done

src/actiontype_string.go

@@ -25,154 +25,164 @@ func _() {
 	_ = x[actBackwardDeleteChar-14]
 	_ = x[actBackwardDeleteCharEof-15]
 	_ = x[actBackwardWord-16]
-	_ = x[actCancel-17]
+	_ = x[actBackwardSubWord-17]
-	_ = x[actChangeBorderLabel-18]
+	_ = x[actCancel-18]
-	_ = x[actChangeGhost-19]
+	_ = x[actChangeBorderLabel-19]
-	_ = x[actChangeHeader-20]
+	_ = x[actChangeGhost-20]
-	_ = x[actChangeFooter-21]
+	_ = x[actChangeHeader-21]
-	_ = x[actChangeHeaderLabel-22]
+	_ = x[actChangeFooter-22]
-	_ = x[actChangeFooterLabel-23]
+	_ = x[actChangeHeaderLabel-23]
-	_ = x[actChangeInputLabel-24]
+	_ = x[actChangeFooterLabel-24]
-	_ = x[actChangeListLabel-25]
+	_ = x[actChangeInputLabel-25]
-	_ = x[actChangeMulti-26]
+	_ = x[actChangeListLabel-26]
-	_ = x[actChangeNth-27]
+	_ = x[actChangeMulti-27]
-	_ = x[actChangePointer-28]
+	_ = x[actChangeNth-28]
-	_ = x[actChangePreview-29]
+	_ = x[actChangePointer-29]
-	_ = x[actChangePreviewLabel-30]
+	_ = x[actChangePreview-30]
-	_ = x[actChangePreviewWindow-31]
+	_ = x[actChangePreviewLabel-31]
-	_ = x[actChangePrompt-32]
+	_ = x[actChangePreviewWindow-32]
-	_ = x[actChangeQuery-33]
+	_ = x[actChangePrompt-33]
-	_ = x[actClearScreen-34]
+	_ = x[actChangeQuery-34]
-	_ = x[actClearQuery-35]
+	_ = x[actClearScreen-35]
-	_ = x[actClearSelection-36]
+	_ = x[actClearQuery-36]
-	_ = x[actClose-37]
+	_ = x[actClearSelection-37]
-	_ = x[actDeleteChar-38]
+	_ = x[actClose-38]
-	_ = x[actDeleteCharEof-39]
+	_ = x[actDeleteChar-39]
-	_ = x[actEndOfLine-40]
+	_ = x[actDeleteCharEof-40]
-	_ = x[actFatal-41]
+	_ = x[actEndOfLine-41]
-	_ = x[actForwardChar-42]
+	_ = x[actFatal-42]
-	_ = x[actForwardWord-43]
+	_ = x[actForwardChar-43]
-	_ = x[actKillLine-44]
+	_ = x[actForwardWord-44]
-	_ = x[actKillWord-45]
+	_ = x[actForwardSubWord-45]
-	_ = x[actUnixLineDiscard-46]
+	_ = x[actKillLine-46]
-	_ = x[actUnixWordRubout-47]
+	_ = x[actKillWord-47]
-	_ = x[actYank-48]
+	_ = x[actKillSubWord-48]
-	_ = x[actBackwardKillWord-49]
+	_ = x[actUnixLineDiscard-49]
-	_ = x[actSelectAll-50]
+	_ = x[actUnixWordRubout-50]
-	_ = x[actDeselectAll-51]
+	_ = x[actYank-51]
-	_ = x[actToggle-52]
+	_ = x[actBackwardKillWord-52]
-	_ = x[actToggleSearch-53]
+	_ = x[actBackwardKillSubWord-53]
-	_ = x[actToggleAll-54]
+	_ = x[actSelectAll-54]
-	_ = x[actToggleDown-55]
+	_ = x[actDeselectAll-55]
-	_ = x[actToggleUp-56]
+	_ = x[actToggle-56]
-	_ = x[actToggleIn-57]
+	_ = x[actToggleSearch-57]
-	_ = x[actToggleOut-58]
+	_ = x[actToggleAll-58]
-	_ = x[actToggleTrack-59]
+	_ = x[actToggleDown-59]
-	_ = x[actToggleTrackCurrent-60]
+	_ = x[actToggleUp-60]
-	_ = x[actToggleHeader-61]
+	_ = x[actToggleIn-61]
-	_ = x[actToggleWrap-62]
+	_ = x[actToggleOut-62]
-	_ = x[actToggleMultiLine-63]
+	_ = x[actToggleTrack-63]
-	_ = x[actToggleHscroll-64]
+	_ = x[actToggleTrackCurrent-64]
-	_ = x[actTrackCurrent-65]
+	_ = x[actToggleHeader-65]
-	_ = x[actToggleInput-66]
+	_ = x[actToggleWrap-66]
-	_ = x[actHideInput-67]
+	_ = x[actToggleMultiLine-67]
-	_ = x[actShowInput-68]
+	_ = x[actToggleHscroll-68]
-	_ = x[actUntrackCurrent-69]
+	_ = x[actToggleRaw-69]
-	_ = x[actDown-70]
+	_ = x[actEnableRaw-70]
-	_ = x[actUp-71]
+	_ = x[actDisableRaw-71]
-	_ = x[actPageUp-72]
+	_ = x[actTrackCurrent-72]
-	_ = x[actPageDown-73]
+	_ = x[actToggleInput-73]
-	_ = x[actPosition-74]
+	_ = x[actHideInput-74]
-	_ = x[actHalfPageUp-75]
+	_ = x[actShowInput-75]
-	_ = x[actHalfPageDown-76]
+	_ = x[actUntrackCurrent-76]
-	_ = x[actOffsetUp-77]
+	_ = x[actDown-77]
-	_ = x[actOffsetDown-78]
+	_ = x[actDownMatch-78]
-	_ = x[actOffsetMiddle-79]
+	_ = x[actUp-79]
-	_ = x[actJump-80]
+	_ = x[actUpMatch-80]
-	_ = x[actJumpAccept-81]
+	_ = x[actPageUp-81]
-	_ = x[actPrintQuery-82]
+	_ = x[actPageDown-82]
-	_ = x[actRefreshPreview-83]
+	_ = x[actPosition-83]
-	_ = x[actReplaceQuery-84]
+	_ = x[actHalfPageUp-84]
-	_ = x[actToggleSort-85]
+	_ = x[actHalfPageDown-85]
-	_ = x[actShowPreview-86]
+	_ = x[actOffsetUp-86]
-	_ = x[actHidePreview-87]
+	_ = x[actOffsetDown-87]
-	_ = x[actTogglePreview-88]
+	_ = x[actOffsetMiddle-88]
-	_ = x[actTogglePreviewWrap-89]
+	_ = x[actJump-89]
-	_ = x[actTransform-90]
+	_ = x[actJumpAccept-90]
-	_ = x[actTransformBorderLabel-91]
+	_ = x[actPrintQuery-91]
-	_ = x[actTransformGhost-92]
+	_ = x[actRefreshPreview-92]
-	_ = x[actTransformHeader-93]
+	_ = x[actReplaceQuery-93]
-	_ = x[actTransformFooter-94]
+	_ = x[actToggleSort-94]
-	_ = x[actTransformHeaderLabel-95]
+	_ = x[actShowPreview-95]
-	_ = x[actTransformFooterLabel-96]
+	_ = x[actHidePreview-96]
-	_ = x[actTransformInputLabel-97]
+	_ = x[actTogglePreview-97]
-	_ = x[actTransformListLabel-98]
+	_ = x[actTogglePreviewWrap-98]
-	_ = x[actTransformNth-99]
+	_ = x[actTransform-99]
-	_ = x[actTransformPointer-100]
+	_ = x[actTransformBorderLabel-100]
-	_ = x[actTransformPreviewLabel-101]
+	_ = x[actTransformGhost-101]
-	_ = x[actTransformPrompt-102]
+	_ = x[actTransformHeader-102]
-	_ = x[actTransformQuery-103]
+	_ = x[actTransformFooter-103]
-	_ = x[actTransformSearch-104]
+	_ = x[actTransformHeaderLabel-104]
-	_ = x[actTrigger-105]
+	_ = x[actTransformFooterLabel-105]
-	_ = x[actBgTransform-106]
+	_ = x[actTransformInputLabel-106]
-	_ = x[actBgTransformBorderLabel-107]
+	_ = x[actTransformListLabel-107]
-	_ = x[actBgTransformGhost-108]
+	_ = x[actTransformNth-108]
-	_ = x[actBgTransformHeader-109]
+	_ = x[actTransformPointer-109]
-	_ = x[actBgTransformFooter-110]
+	_ = x[actTransformPreviewLabel-110]
-	_ = x[actBgTransformHeaderLabel-111]
+	_ = x[actTransformPrompt-111]
-	_ = x[actBgTransformFooterLabel-112]
+	_ = x[actTransformQuery-112]
-	_ = x[actBgTransformInputLabel-113]
+	_ = x[actTransformSearch-113]
-	_ = x[actBgTransformListLabel-114]
+	_ = x[actTrigger-114]
-	_ = x[actBgTransformNth-115]
+	_ = x[actBgTransform-115]
-	_ = x[actBgTransformPointer-116]
+	_ = x[actBgTransformBorderLabel-116]
-	_ = x[actBgTransformPreviewLabel-117]
+	_ = x[actBgTransformGhost-117]
-	_ = x[actBgTransformPrompt-118]
+	_ = x[actBgTransformHeader-118]
-	_ = x[actBgTransformQuery-119]
+	_ = x[actBgTransformFooter-119]
-	_ = x[actBgTransformSearch-120]
+	_ = x[actBgTransformHeaderLabel-120]
-	_ = x[actBgCancel-121]
+	_ = x[actBgTransformFooterLabel-121]
-	_ = x[actSearch-122]
+	_ = x[actBgTransformInputLabel-122]
-	_ = x[actPreview-123]
+	_ = x[actBgTransformListLabel-123]
-	_ = x[actPreviewTop-124]
+	_ = x[actBgTransformNth-124]
-	_ = x[actPreviewBottom-125]
+	_ = x[actBgTransformPointer-125]
-	_ = x[actPreviewUp-126]
+	_ = x[actBgTransformPreviewLabel-126]
-	_ = x[actPreviewDown-127]
+	_ = x[actBgTransformPrompt-127]
-	_ = x[actPreviewPageUp-128]
+	_ = x[actBgTransformQuery-128]
-	_ = x[actPreviewPageDown-129]
+	_ = x[actBgTransformSearch-129]
-	_ = x[actPreviewHalfPageUp-130]
+	_ = x[actBgCancel-130]
-	_ = x[actPreviewHalfPageDown-131]
+	_ = x[actSearch-131]
-	_ = x[actPrevHistory-132]
+	_ = x[actPreview-132]
-	_ = x[actPrevSelected-133]
+	_ = x[actPreviewTop-133]
-	_ = x[actPrint-134]
+	_ = x[actPreviewBottom-134]
-	_ = x[actPut-135]
+	_ = x[actPreviewUp-135]
-	_ = x[actNextHistory-136]
+	_ = x[actPreviewDown-136]
-	_ = x[actNextSelected-137]
+	_ = x[actPreviewPageUp-137]
-	_ = x[actExecute-138]
+	_ = x[actPreviewPageDown-138]
-	_ = x[actExecuteSilent-139]
+	_ = x[actPreviewHalfPageUp-139]
-	_ = x[actExecuteMulti-140]
+	_ = x[actPreviewHalfPageDown-140]
-	_ = x[actSigStop-141]
+	_ = x[actPrevHistory-141]
-	_ = x[actFirst-142]
+	_ = x[actPrevSelected-142]
-	_ = x[actLast-143]
+	_ = x[actPrint-143]
-	_ = x[actReload-144]
+	_ = x[actPut-144]
-	_ = x[actReloadSync-145]
+	_ = x[actNextHistory-145]
-	_ = x[actDisableSearch-146]
+	_ = x[actNextSelected-146]
-	_ = x[actEnableSearch-147]
+	_ = x[actExecute-147]
-	_ = x[actSelect-148]
+	_ = x[actExecuteSilent-148]
-	_ = x[actDeselect-149]
+	_ = x[actExecuteMulti-149]
-	_ = x[actUnbind-150]
+	_ = x[actSigStop-150]
-	_ = x[actRebind-151]
+	_ = x[actBest-151]
-	_ = x[actToggleBind-152]
+	_ = x[actFirst-152]
-	_ = x[actBecome-153]
+	_ = x[actLast-153]
-	_ = x[actShowHeader-154]
+	_ = x[actReload-154]
-	_ = x[actHideHeader-155]
+	_ = x[actReloadSync-155]
-	_ = x[actBell-156]
+	_ = x[actDisableSearch-156]
-	_ = x[actExclude-157]
+	_ = x[actEnableSearch-157]
-	_ = x[actExcludeMulti-158]
+	_ = x[actSelect-158]
-	_ = x[actAsync-159]
+	_ = x[actDeselect-159]
+	_ = x[actUnbind-160]
+	_ = x[actRebind-161]
+	_ = x[actToggleBind-162]
+	_ = x[actBecome-163]
+	_ = x[actShowHeader-164]
+	_ = x[actHideHeader-165]
+	_ = x[actBell-166]
+	_ = x[actExclude-167]
+	_ = x[actExcludeMulti-168]
+	_ = x[actAsync-169]
 }
 
-const _actionType_name = "actIgnoreactStartactClickactInvalidactBracketedPasteBeginactBracketedPasteEndactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactCancelactChangeBorderLabelactChangeGhostactChangeHeaderactChangeFooteractChangeHeaderLabelactChangeFooterLabelactChangeInputLabelactChangeListLabelactChangeMultiactChangeNthactChangePointeractChangePreviewactChangePreviewLabelactChangePreviewWindowactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactKillLineactKillWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleMultiLineactToggleHscrollactTrackCurrentactToggleInputactHideInputactShowInputactUntrackCurrentactDownactUpactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformGhostactTransformHeaderactTransformFooteractTransformHeaderLabelactTransformFooterLabelactTransformInputLabelactTransformListLabelactTransformNthactTransformPointeractTransformPreviewLabelactTransformPromptactTransformQueryactTransformSearchactTriggeractBgTransformactBgTransformBorderLabelactBgTransformGhostactBgTransformHeaderactBgTransformFooteractBgTransformHeaderLabelactBgTransformFooterLabelactBgTransformInputLabelactBgTransformListLabelactBgTransformNthactBgTransformPointeractBgTransformPreviewLabelactBgTransformPromptactBgTransformQueryactBgTransformSearchactBgCancelactSearchactPreviewactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactToggleBindactBecomeactShowHeaderactHideHeaderactBellactExcludeactExcludeMultiactAsync"
+const _actionType_name = "actIgnoreactStartactClickactInvalidactBracketedPasteBeginactBracketedPasteEndactCharactMouseactBeginningOfLineactAbortactAcceptactAcceptNonEmptyactAcceptOrPrintQueryactBackwardCharactBackwardDeleteCharactBackwardDeleteCharEofactBackwardWordactBackwardSubWordactCancelactChangeBorderLabelactChangeGhostactChangeHeaderactChangeFooteractChangeHeaderLabelactChangeFooterLabelactChangeInputLabelactChangeListLabelactChangeMultiactChangeNthactChangePointeractChangePreviewactChangePreviewLabelactChangePreviewWindowactChangePromptactChangeQueryactClearScreenactClearQueryactClearSelectionactCloseactDeleteCharactDeleteCharEofactEndOfLineactFatalactForwardCharactForwardWordactForwardSubWordactKillLineactKillWordactKillSubWordactUnixLineDiscardactUnixWordRuboutactYankactBackwardKillWordactBackwardKillSubWordactSelectAllactDeselectAllactToggleactToggleSearchactToggleAllactToggleDownactToggleUpactToggleInactToggleOutactToggleTrackactToggleTrackCurrentactToggleHeaderactToggleWrapactToggleMultiLineactToggleHscrollactToggleRawactEnableRawactDisableRawactTrackCurrentactToggleInputactHideInputactShowInputactUntrackCurrentactDownactDownMatchactUpactUpMatchactPageUpactPageDownactPositionactHalfPageUpactHalfPageDownactOffsetUpactOffsetDownactOffsetMiddleactJumpactJumpAcceptactPrintQueryactRefreshPreviewactReplaceQueryactToggleSortactShowPreviewactHidePreviewactTogglePreviewactTogglePreviewWrapactTransformactTransformBorderLabelactTransformGhostactTransformHeaderactTransformFooteractTransformHeaderLabelactTransformFooterLabelactTransformInputLabelactTransformListLabelactTransformNthactTransformPointeractTransformPreviewLabelactTransformPromptactTransformQueryactTransformSearchactTriggeractBgTransformactBgTransformBorderLabelactBgTransformGhostactBgTransformHeaderactBgTransformFooteractBgTransformHeaderLabelactBgTransformFooterLabelactBgTransformInputLabelactBgTransformListLabelactBgTransformNthactBgTransformPointeractBgTransformPreviewLabelactBgTransformPromptactBgTransformQueryactBgTransformSearchactBgCancelactSearchactPreviewactPreviewTopactPreviewBottomactPreviewUpactPreviewDownactPreviewPageUpactPreviewPageDownactPreviewHalfPageUpactPreviewHalfPageDownactPrevHistoryactPrevSelectedactPrintactPutactNextHistoryactNextSelectedactExecuteactExecuteSilentactExecuteMultiactSigStopactBestactFirstactLastactReloadactReloadSyncactDisableSearchactEnableSearchactSelectactDeselectactUnbindactRebindactToggleBindactBecomeactShowHeaderactHideHeaderactBellactExcludeactExcludeMultiactAsync"
 
-var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 57, 77, 84, 92, 110, 118, 127, 144, 165, 180, 201, 225, 240, 249, 269, 283, 298, 313, 333, 353, 372, 390, 404, 416, 432, 448, 469, 491, 506, 520, 534, 547, 564, 572, 585, 601, 613, 621, 635, 649, 660, 671, 689, 706, 713, 732, 744, 758, 767, 782, 794, 807, 818, 829, 841, 855, 876, 891, 904, 922, 938, 953, 967, 979, 991, 1008, 1015, 1020, 1029, 1040, 1051, 1064, 1079, 1090, 1103, 1118, 1125, 1138, 1151, 1168, 1183, 1196, 1210, 1224, 1240, 1260, 1272, 1295, 1312, 1330, 1348, 1371, 1394, 1416, 1437, 1452, 1471, 1495, 1513, 1530, 1548, 1558, 1572, 1597, 1616, 1636, 1656, 1681, 1706, 1730, 1753, 1770, 1791, 1817, 1837, 1856, 1876, 1887, 1896, 1906, 1919, 1935, 1947, 1961, 1977, 1995, 2015, 2037, 2051, 2066, 2074, 2080, 2094, 2109, 2119, 2135, 2150, 2160, 2168, 2175, 2184, 2197, 2213, 2228, 2237, 2248, 2257, 2266, 2279, 2288, 2301, 2314, 2321, 2331, 2346, 2354}
+var _actionType_index = [...]uint16{0, 9, 17, 25, 35, 57, 77, 84, 92, 110, 118, 127, 144, 165, 180, 201, 225, 240, 258, 267, 287, 301, 316, 331, 351, 371, 390, 408, 422, 434, 450, 466, 487, 509, 524, 538, 552, 565, 582, 590, 603, 619, 631, 639, 653, 667, 684, 695, 706, 720, 738, 755, 762, 781, 803, 815, 829, 838, 853, 865, 878, 889, 900, 912, 926, 947, 962, 975, 993, 1009, 1021, 1033, 1046, 1061, 1075, 1087, 1099, 1116, 1123, 1135, 1140, 1150, 1159, 1170, 1181, 1194, 1209, 1220, 1233, 1248, 1255, 1268, 1281, 1298, 1313, 1326, 1340, 1354, 1370, 1390, 1402, 1425, 1442, 1460, 1478, 1501, 1524, 1546, 1567, 1582, 1601, 1625, 1643, 1660, 1678, 1688, 1702, 1727, 1746, 1766, 1786, 1811, 1836, 1860, 1883, 1900, 1921, 1947, 1967, 1986, 2006, 2017, 2026, 2036, 2049, 2065, 2077, 2091, 2107, 2125, 2145, 2167, 2181, 2196, 2204, 2210, 2224, 2239, 2249, 2265, 2280, 2290, 2297, 2305, 2312, 2321, 2334, 2350, 2365, 2374, 2385, 2394, 2403, 2416, 2425, 2438, 2451, 2458, 2468, 2483, 2491}
 
 func (i actionType) String() string {
 	if i < 0 || i >= actionType(len(_actionType_index)-1) {

src/core.go

@@ -2,6 +2,7 @@
 package fzf
 
 import (
+	"maps"
 	"os"
 	"sync"
 	"time"
@@ -225,10 +226,7 @@ func Run(opts *Options) (int, error) {
 	}
 	patternBuilder := func(runes []rune) *Pattern {
 		denyMutex.Lock()
-		denylistCopy := make(map[int32]struct{})
+		denylistCopy := maps.Clone(denylist)
-		for k, v := range denylist {
-			denylistCopy[k] = v
-		}
 		denyMutex.Unlock()
 		return BuildPattern(cache, patternCache,
 			opts.Fuzzy, opts.FuzzyAlgo, opts.Extended, opts.Case, opts.Normalize, forward, withPos,
@@ -269,11 +267,11 @@ func Run(opts *Options) (int, error) {
 
 			// NOTE: Streaming filter is inherently not compatible with --tail
 			snapshot, _, _ := chunkList.Snapshot(opts.Tail)
-			merger, _ := matcher.scan(MatchRequest{
+			result := matcher.scan(MatchRequest{
 				chunks:  snapshot,
 				pattern: pattern})
-			for i := 0; i < merger.Length(); i++ {
+			for i := 0; i < result.merger.Length(); i++ {
-				opts.Printer(merger.Get(i).item.AsString(opts.Ansi))
+				opts.Printer(result.merger.Get(i).item.AsString(opts.Ansi))
 				found = true
 			}
 		}
@@ -481,12 +479,13 @@ func Run(opts *Options) (int, error) {
 
 				case EvtSearchFin:
 					switch val := value.(type) {
-					case *Merger:
+					case MatchResult:
+						merger := val.merger
 						if deferred {
-							count := val.Length()
+							count := merger.Length()
 							if opts.Select1 && count > 1 || opts.Exit0 && !opts.Select1 && count > 0 {
-								determine(val.final)
+								determine(merger.final)
-							} else if val.final {
+							} else if merger.final {
 								if opts.Exit0 && count == 0 || opts.Select1 && count == 1 {
 									if opts.PrintQuery {
 										opts.Printer(opts.Query)
@@ -504,7 +503,7 @@ func Run(opts *Options) (int, error) {
 										}
 									}
 									for i := 0; i < count; i++ {
-										opts.Printer(transformer(val.Get(i).item))
+										opts.Printer(transformer(merger.Get(i).item))
 									}
 									if count == 0 {
 										exitCode = ExitNoMatch
@@ -512,7 +511,7 @@ func Run(opts *Options) (int, error) {
 									stop = true
 									return
 								}
-								determine(val.final)
+								determine(merger.final)
 							}
 						}
 						terminal.UpdateList(val)

src/matcher.go

@@ -19,6 +19,20 @@ type MatchRequest struct {
 	revision revision
 }
 
+type MatchResult struct {
+	merger     *Merger
+	passMerger *Merger
+	cancelled  bool
+}
+
+func (mr MatchResult) cacheable() bool {
+	return mr.merger != nil && mr.merger.cacheable()
+}
+
+func (mr MatchResult) final() bool {
+	return mr.merger != nil && mr.merger.final
+}
+
 // Matcher is responsible for performing search
 type Matcher struct {
 	cache          *ChunkCache
@@ -29,7 +43,7 @@ type Matcher struct {
 	reqBox         *util.EventBox
 	partitions     int
 	slab           []*util.Slab
-	mergerCache    map[string]*Merger
+	mergerCache    map[string]MatchResult
 	revision       revision
 }
 
@@ -51,7 +65,7 @@ func NewMatcher(cache *ChunkCache, patternBuilder func([]rune) *Pattern,
 		reqBox:         util.NewEventBox(),
 		partitions:     partitions,
 		slab:           make([]*util.Slab, partitions),
-		mergerCache:    make(map[string]*Merger),
+		mergerCache:    make(map[string]MatchResult),
 		revision:       revision}
 }
 
@@ -85,43 +99,42 @@ func (m *Matcher) Loop() {
 		cacheCleared := false
 		if request.sort != m.sort || request.revision != m.revision {
 			m.sort = request.sort
-			m.revision = request.revision
+			m.mergerCache = make(map[string]MatchResult)
-			m.mergerCache = make(map[string]*Merger)
 			if !request.revision.compatible(m.revision) {
 				m.cache.Clear()
 			}
+			m.revision = request.revision
 			cacheCleared = true
 		}
 
 		// Restart search
 		patternString := request.pattern.AsString()
-		var merger *Merger
+		var result MatchResult
-		cancelled := false
 		count := CountItems(request.chunks)
 
 		if !cacheCleared {
 			if count == prevCount {
 				// Look up mergerCache
-				if cached, found := m.mergerCache[patternString]; found && cached.final == request.final {
+				if cached, found := m.mergerCache[patternString]; found && cached.final() == request.final {
-					merger = cached
+					result = cached
 				}
 			} else {
 				// Invalidate mergerCache
 				prevCount = count
-				m.mergerCache = make(map[string]*Merger)
+				m.mergerCache = make(map[string]MatchResult)
 			}
 		}
 
-		if merger == nil {
+		if result.merger == nil {
-			merger, cancelled = m.scan(request)
+			result = m.scan(request)
 		}
 
-		if !cancelled {
+		if !result.cancelled {
-			if merger.cacheable() {
+			if result.cacheable() {
-				m.mergerCache[patternString] = merger
+				m.mergerCache[patternString] = result
 			}
-			merger.final = request.final
+			result.merger.final = request.final
-			m.eventBox.Set(EvtSearchFin, merger)
+			m.eventBox.Set(EvtSearchFin, result)
 		}
 	}
 }
@@ -152,16 +165,18 @@ type partialResult struct {
 	matches []Result
 }
 
-func (m *Matcher) scan(request MatchRequest) (*Merger, bool) {
+func (m *Matcher) scan(request MatchRequest) MatchResult {
 	startedAt := time.Now()
 
 	numChunks := len(request.chunks)
 	if numChunks == 0 {
-		return EmptyMerger(request.revision), false
+		m := EmptyMerger(request.revision)
+		return MatchResult{m, m, false}
 	}
 	pattern := request.pattern
+	passMerger := PassMerger(&request.chunks, m.tac, request.revision)
 	if pattern.IsEmpty() {
-		return PassMerger(&request.chunks, m.tac, request.revision), false
+		return MatchResult{passMerger, passMerger, false}
 	}
 
 	minIndex := request.chunks[0].items[0].Index()
@@ -224,7 +239,7 @@ func (m *Matcher) scan(request MatchRequest) (*Merger, bool) {
 		}
 
 		if m.reqBox.Peek(reqReset) {
-			return nil, wait()
+			return MatchResult{nil, nil, wait()}
 		}
 
 		if time.Since(startedAt) > progressMinDuration {
@@ -237,7 +252,8 @@ func (m *Matcher) scan(request MatchRequest) (*Merger, bool) {
 		partialResult := <-resultChan
 		partialResults[partialResult.index] = partialResult.matches
 	}
-	return NewMerger(pattern, partialResults, m.sort && request.pattern.sortable, m.tac, request.revision, minIndex, maxIndex), false
+	merger := NewMerger(pattern, partialResults, m.sort && request.pattern.sortable, m.tac, request.revision, minIndex, maxIndex)
+	return MatchResult{merger, passMerger, false}
 }
 
 // Reset is called to interrupt/signal the ongoing search

src/merger.go

@@ -141,6 +141,15 @@ func (mg *Merger) Get(idx int) Result {
 	panic(fmt.Sprintf("Index out of bounds (unsorted, %d/%d)", idx, mg.count))
 }
 
+func (mg *Merger) ToMap() map[int32]Result {
+	ret := make(map[int32]Result, mg.count)
+	for i := 0; i < mg.count; i++ {
+		result := mg.Get(i)
+		ret[result.Index()] = result
+	}
+	return ret
+}
+
 func (mg *Merger) cacheable() bool {
 	return mg.count < mergerCacheMax
 }

src/options.go

@@ -3,6 +3,7 @@ package fzf
 import (
 	"errors"
 	"fmt"
+	"maps"
 	"os"
 	"regexp"
 	"strconv"
@@ -59,7 +60,7 @@ Usage: fzf [options]
 
   GLOBAL STYLE
     --style=PRESET           Apply a style preset [default|minimal|full[:BORDER_STYLE]
-    --color=COLSPEC          Base scheme (dark|light|16|bw) and/or custom colors
+    --color=COLSPEC          Base scheme (dark|light|base16|bw) and/or custom colors
     --no-color               Disable colors
     --no-bold                Do not use bold text
 
@@ -97,6 +98,7 @@ Usage: fzf [options]
     --wrap                   Enable line wrap
     --wrap-sign=STR          Indicator for wrapped lines
     --no-multi-line          Disable multi-line display of items when using --read0
+    --raw                    Enable raw mode (show non-matching items)
     --track                  Track the current selection when the result is updated
     --tac                    Reverse the order of the input
     --gap[=N]                Render empty lines between each item
@@ -109,6 +111,8 @@ Usage: fzf [options]
     --hscroll-off=COLS       Number of screen columns to keep to the right of the
                              highlighted substring (default: 10)
     --jump-labels=CHARS      Label characters for jump mode
+    --gutter=CHAR            Character used for the gutter column (default: '▌')
+    --gutter-raw=CHAR        Character used for the gutter column in raw mode (default: '▖')
     --pointer=STR            Pointer to the current line (default: '▌' or '>')
     --marker=STR             Multi-select marker (default: '┃' or '>')
     --marker-multi-line=STR  Multi-select marker for multi-line entries;
@@ -202,8 +206,10 @@ Usage: fzf [options]
 
   ADVANCED
     --with-shell=STR         Shell command and flags to start child processes with
-    --listen[=[ADDR:]PORT]   Start HTTP server to receive actions (POST /)
+    --listen[=[ADDR:]PORT]   Start HTTP server to receive actions via TCP
                              (To allow remote process execution, use --listen-unsafe)
+    --listen=SOCKET_PATH     Start HTTP server to receive actions via Unix domain socket
+                             (Path should end with .sock)
 
   DIRECTORY TRAVERSAL        (Only used when $FZF_DEFAULT_COMMAND is not set)
     --walker=OPTS            [file][,dir][,follow][,hidden] (default: file,follow,hidden)
@@ -212,8 +218,8 @@ Usage: fzf [options]
                              (default: .git,node_modules)
 
   HISTORY
-    --history=FILE           History file
+    --history=FILE           File to store fzf search history (*not* shell command history)
-    --history-size=N         Maximum number of history entries (default: 1000)
+    --history-size=N         Maximum number of entries to keep in the file (default: 1000)
 
   SHELL INTEGRATION
     --bash                   Print script to set up Bash shell integration
@@ -560,6 +566,7 @@ type Options struct {
 	AcceptNth         func(Delimiter) func([]Token, int32) string
 	Delimiter         Delimiter
 	Sort              int
+	Raw               bool
 	Track             trackOption
 	Tac               bool
 	Tail              int
@@ -567,6 +574,7 @@ type Options struct {
 	Multi             int
 	Ansi              bool
 	Mouse             bool
+	BaseTheme         *tui.ColorTheme
 	Theme             *tui.ColorTheme
 	Black             bool
 	Bold              bool
@@ -590,6 +598,8 @@ type Options struct {
 	Separator         *string
 	JumpLabels        string
 	Prompt            string
+	Gutter            *string
+	GutterRaw         *string
 	Pointer           *string
 	Marker            *string
 	MarkerMulti       *[3]string
@@ -665,9 +675,9 @@ func defaultPreviewOpts(command string) previewOpts {
 func defaultOptions() *Options {
 	var theme *tui.ColorTheme
 	if os.Getenv("NO_COLOR") != "" {
-		theme = tui.NoColorTheme()
+		theme = tui.NoColorTheme
 	} else {
-		theme = tui.EmptyTheme()
+		theme = tui.EmptyTheme
 	}
 
 	return &Options{
@@ -710,6 +720,8 @@ func defaultOptions() *Options {
 		Separator:    nil,
 		JumpLabels:   defaultJumpLabels,
 		Prompt:       "> ",
+		Gutter:       nil,
+		GutterRaw:    nil,
 		Pointer:      nil,
 		Marker:       nil,
 		MarkerMulti:  nil,
@@ -974,8 +986,6 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 			add(tui.Backspace)
 		case "ctrl-space":
 			add(tui.CtrlSpace)
-		case "ctrl-delete":
-			add(tui.CtrlDelete)
 		case "ctrl-^", "ctrl-6":
 			add(tui.CtrlCaret)
 		case "ctrl-/", "ctrl-_":
@@ -1022,6 +1032,10 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 			list = append(list, evt)
 		case "alt-bs", "alt-bspace", "alt-backspace":
 			add(tui.AltBackspace)
+		case "ctrl-bs", "ctrl-bspace", "ctrl-backspace":
+			add(tui.CtrlBackspace)
+		case "ctrl-alt-bs", "ctrl-alt-bspace", "ctrl-alt-backspace":
+			add(tui.CtrlAltBackspace)
 		case "alt-up":
 			add(tui.AltUp)
 		case "alt-down":
@@ -1030,6 +1044,16 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 			add(tui.AltLeft)
 		case "alt-right":
 			add(tui.AltRight)
+		case "alt-home":
+			add(tui.AltHome)
+		case "alt-end":
+			add(tui.AltEnd)
+		case "alt-delete":
+			add(tui.AltDelete)
+		case "alt-page-up":
+			add(tui.AltPageUp)
+		case "alt-page-down":
+			add(tui.AltPageDown)
 		case "tab":
 			add(tui.Tab)
 		case "btab", "shift-tab":
@@ -1056,6 +1080,88 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 			add(tui.AltShiftLeft)
 		case "alt-shift-right", "shift-alt-right":
 			add(tui.AltShiftRight)
+		case "alt-shift-home", "shift-alt-home":
+			add(tui.AltShiftHome)
+		case "alt-shift-end", "shift-alt-end":
+			add(tui.AltShiftEnd)
+		case "alt-shift-delete", "shift-alt-delete":
+			add(tui.AltShiftDelete)
+		case "alt-shift-page-up", "shift-alt-page-up":
+			add(tui.AltShiftPageUp)
+		case "alt-shift-page-down", "shift-alt-page-down":
+			add(tui.AltShiftPageDown)
+		case "ctrl-up":
+			add(tui.CtrlUp)
+		case "ctrl-down":
+			add(tui.CtrlDown)
+		case "ctrl-right":
+			add(tui.CtrlRight)
+		case "ctrl-left":
+			add(tui.CtrlLeft)
+		case "ctrl-home":
+			add(tui.CtrlHome)
+		case "ctrl-end":
+			add(tui.CtrlEnd)
+		case "ctrl-delete":
+			add(tui.CtrlDelete)
+		case "ctrl-page-up":
+			add(tui.CtrlPageUp)
+		case "ctrl-page-down":
+			add(tui.CtrlPageDown)
+		case "ctrl-alt-up", "alt-ctrl-up":
+			add(tui.CtrlAltUp)
+		case "ctrl-alt-down", "alt-ctrl-down":
+			add(tui.CtrlAltDown)
+		case "ctrl-alt-right", "alt-ctrl-right":
+			add(tui.CtrlAltRight)
+		case "ctrl-alt-left", "alt-ctrl-left":
+			add(tui.CtrlAltLeft)
+		case "ctrl-alt-home", "alt-ctrl-home":
+			add(tui.CtrlAltHome)
+		case "ctrl-alt-end", "alt-ctrl-end":
+			add(tui.CtrlAltEnd)
+		case "ctrl-alt-delete", "alt-ctrl-delete":
+			add(tui.CtrlAltDelete)
+		case "ctrl-alt-page-up", "alt-ctrl-page-up":
+			add(tui.CtrlAltPageUp)
+		case "ctrl-alt-page-down", "alt-ctrl-page-down":
+			add(tui.CtrlAltPageDown)
+		case "ctrl-shift-up", "shift-ctrl-up":
+			add(tui.CtrlShiftUp)
+		case "ctrl-shift-down", "shift-ctrl-down":
+			add(tui.CtrlShiftDown)
+		case "ctrl-shift-right", "shift-ctrl-right":
+			add(tui.CtrlShiftRight)
+		case "ctrl-shift-left", "shift-ctrl-left":
+			add(tui.CtrlShiftLeft)
+		case "ctrl-shift-home", "shift-ctrl-home":
+			add(tui.CtrlShiftHome)
+		case "ctrl-shift-end", "shift-ctrl-end":
+			add(tui.CtrlShiftEnd)
+		case "ctrl-shift-delete", "shift-ctrl-delete":
+			add(tui.CtrlShiftDelete)
+		case "ctrl-shift-page-up", "shift-ctrl-page-up":
+			add(tui.CtrlShiftPageUp)
+		case "ctrl-shift-page-down", "shift-ctrl-page-down":
+			add(tui.CtrlShiftPageDown)
+		case "ctrl-alt-shift-up":
+			add(tui.CtrlAltShiftUp)
+		case "ctrl-alt-shift-down":
+			add(tui.CtrlAltShiftDown)
+		case "ctrl-alt-shift-right":
+			add(tui.CtrlAltShiftRight)
+		case "ctrl-alt-shift-left":
+			add(tui.CtrlAltShiftLeft)
+		case "ctrl-alt-shift-home":
+			add(tui.CtrlAltShiftHome)
+		case "ctrl-alt-shift-end":
+			add(tui.CtrlAltShiftEnd)
+		case "ctrl-alt-shift-delete":
+			add(tui.CtrlAltShiftDelete)
+		case "ctrl-alt-shift-page-up":
+			add(tui.CtrlAltShiftPageUp)
+		case "ctrl-alt-shift-page-down":
+			add(tui.CtrlAltShiftPageDown)
 		case "shift-up":
 			add(tui.ShiftUp)
 		case "shift-down":
@@ -1064,8 +1170,16 @@ func parseKeyChords(str string, message string) (map[tui.Event]string, []tui.Eve
 			add(tui.ShiftLeft)
 		case "shift-right":
 			add(tui.ShiftRight)
+		case "shift-home":
+			add(tui.ShiftHome)
+		case "shift-end":
+			add(tui.ShiftEnd)
 		case "shift-delete":
 			add(tui.ShiftDelete)
+		case "shift-page-up":
+			add(tui.ShiftPageUp)
+		case "shift-page-down":
+			add(tui.ShiftPageDown)
 		case "left-click":
 			add(tui.LeftClick)
 		case "right-click":
@@ -1206,8 +1320,9 @@ func dupeTheme(theme *tui.ColorTheme) *tui.ColorTheme {
 	return &dupe
 }
 
-func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, error) {
+func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, *tui.ColorTheme, error) {
 	var err error
+	var baseTheme *tui.ColorTheme
 	theme := dupeTheme(defaultTheme)
 	rrggbb := regexp.MustCompile("^#[0-9a-fA-F]{6}$")
 	comma := regexp.MustCompile(`[\s,]+`)
@@ -1218,13 +1333,17 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, erro
 		}
 		switch str {
 		case "dark":
+			baseTheme = tui.Dark256
 			theme = dupeTheme(tui.Dark256)
 		case "light":
+			baseTheme = tui.Light256
 			theme = dupeTheme(tui.Light256)
-		case "16":
+		case "base16", "16":
+			baseTheme = tui.Default16
 			theme = dupeTheme(tui.Default16)
 		case "bw", "no":
-			theme = tui.NoColorTheme()
+			baseTheme = tui.NoColorTheme
+			theme = dupeTheme(tui.NoColorTheme)
 		default:
 			fail := func() {
 				// Let the code proceed to simplify the error handling
@@ -1249,6 +1368,8 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, erro
 						cattr.Attr |= tui.Bold
 					case "dim":
 						cattr.Attr |= tui.Dim
+					case "strip":
+						cattr.Attr |= tui.Strip
 					case "italic":
 						cattr.Attr |= tui.Italic
 					case "underline":
@@ -1336,6 +1457,8 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, erro
 				mergeAttr(&theme.SelectedBg)
 			case "nth":
 				mergeAttr(&theme.Nth)
+			case "nomatch":
+				mergeAttr(&theme.Nomatch)
 			case "gutter":
 				mergeAttr(&theme.Gutter)
 			case "hl":
@@ -1401,7 +1524,7 @@ func parseTheme(defaultTheme *tui.ColorTheme, str string) (*tui.ColorTheme, erro
 			}
 		}
 	}
-	return theme, err
+	return baseTheme, theme, err
 }
 
 func parseWalkerOpts(str string) (walkerOpts, error) {
@@ -1561,6 +1684,8 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actBackwardDeleteCharEof)
 		case "backward-word":
 			appendAction(actBackwardWord)
+		case "backward-subword":
+			appendAction(actBackwardSubWord)
 		case "clear-screen":
 			appendAction(actClearScreen)
 		case "delete-char":
@@ -1581,6 +1706,8 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actForwardChar)
 		case "forward-word":
 			appendAction(actForwardWord)
+		case "forward-subword":
+			appendAction(actForwardSubWord)
 		case "jump":
 			appendAction(actJump)
 		case "jump-accept":
@@ -1589,6 +1716,8 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actKillLine)
 		case "kill-word":
 			appendAction(actKillWord)
+		case "kill-subword":
+			appendAction(actKillSubWord)
 		case "unix-line-discard", "line-discard":
 			appendAction(actUnixLineDiscard)
 		case "unix-word-rubout", "word-rubout":
@@ -1597,6 +1726,8 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actYank)
 		case "backward-kill-word":
 			appendAction(actBackwardKillWord)
+		case "backward-kill-subword":
+			appendAction(actBackwardKillSubWord)
 		case "toggle-down":
 			appendAction(actToggle, actDown)
 		case "toggle-up":
@@ -1627,6 +1758,12 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actToggleMultiLine)
 		case "toggle-hscroll":
 			appendAction(actToggleHscroll)
+		case "toggle-raw":
+			appendAction(actToggleRaw)
+		case "enable-raw":
+			appendAction(actEnableRaw)
+		case "disable-raw":
+			appendAction(actDisableRaw)
 		case "show-header":
 			appendAction(actShowHeader)
 		case "hide-header":
@@ -1647,12 +1784,18 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actToggle)
 		case "down":
 			appendAction(actDown)
+		case "down-match":
+			appendAction(actDownMatch)
 		case "up":
 			appendAction(actUp)
+		case "up-match":
+			appendAction(actUpMatch)
 		case "first", "top":
 			appendAction(actFirst)
 		case "last":
 			appendAction(actLast)
+		case "best":
+			appendAction(actBest)
 		case "page-up":
 			appendAction(actPageUp)
 		case "page-down":
@@ -1665,9 +1808,9 @@ func parseActionList(masked string, original string, prevActions []*action, putA
 			appendAction(actPrevHistory)
 		case "next-history":
 			appendAction(actNextHistory)
-		case "prev-selected":
+		case "up-selected", "prev-selected":
 			appendAction(actPrevSelected)
-		case "next-selected":
+		case "down-selected", "next-selected":
 			appendAction(actNextSelected)
 		case "show-preview":
 			appendAction(actShowPreview)
@@ -2490,9 +2633,7 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			if err != nil {
 				return err
 			}
-			for k, v := range chords {
+			maps.Copy(opts.Expect, chords)
-				opts.Expect[k] = v
-			}
 		case "--no-expect":
 			opts.Expect = make(map[tui.Event]string)
 		case "--enabled", "--no-phony":
@@ -2520,11 +2661,15 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 		case "--color":
 			_, spec := optionalNextString()
 			if len(spec) == 0 {
-				opts.Theme = tui.EmptyTheme()
+				opts.Theme = tui.EmptyTheme
 			} else {
-				if opts.Theme, err = parseTheme(opts.Theme, spec); err != nil {
+				var baseTheme *tui.ColorTheme
+				if baseTheme, opts.Theme, err = parseTheme(opts.Theme, spec); err != nil {
 					return err
 				}
+				if baseTheme != nil {
+					opts.BaseTheme = baseTheme
+				}
 			}
 		case "--toggle-sort":
 			str, err := nextString("key name required")
@@ -2570,6 +2715,10 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			}
 		case "+s", "--no-sort":
 			opts.Sort = 0
+		case "--raw":
+			opts.Raw = true
+		case "--no-raw":
+			opts.Raw = false
 		case "--track":
 			opts.Track = trackEnabled
 		case "--no-track":
@@ -2606,7 +2755,8 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 		case "--no-mouse":
 			opts.Mouse = false
 		case "+c", "--no-color":
-			opts.Theme = tui.NoColorTheme()
+			opts.BaseTheme = tui.NoColorTheme
+			opts.Theme = tui.NoColorTheme
 		case "+2", "--no-256":
 			opts.Theme = tui.Default16
 		case "--black":
@@ -2747,6 +2897,20 @@ func parseOptions(index *int, opts *Options, allArgs []string) error {
 			if err != nil {
 				return err
 			}
+		case "--gutter":
+			str, err := nextString("gutter character required")
+			if err != nil {
+				return err
+			}
+			str = firstLine(str)
+			opts.Gutter = &str
+		case "--gutter-raw":
+			str, err := nextString("gutter character for raw mode required")
+			if err != nil {
+				return err
+			}
+			str = firstLine(str)
+			opts.GutterRaw = &str
 		case "--pointer":
 			str, err := nextString("pointer sign required")
 			if err != nil {
@@ -3245,26 +3409,31 @@ func applyPreset(opts *Options, preset string) error {
 	return nil
 }
 
-func validateSign(sign string, signOptName string) error {
+func validateSign(sign string, signOptName string, maxWidth int) error {
-	if uniseg.StringWidth(sign) > 2 {
+	if uniseg.StringWidth(sign) > maxWidth {
-		return fmt.Errorf("%v display width should be up to 2", signOptName)
+		return fmt.Errorf("%v display width should be up to %d", signOptName, maxWidth)
 	}
 	return nil
 }
 
 func validateOptions(opts *Options) error {
 	if opts.Pointer != nil {
-		if err := validateSign(*opts.Pointer, "pointer"); err != nil {
+		if err := validateSign(*opts.Pointer, "pointer", 2); err != nil {
 			return err
 		}
 	}
 
 	if opts.Marker != nil {
-		if err := validateSign(*opts.Marker, "marker"); err != nil {
+		if err := validateSign(*opts.Marker, "marker", 2); err != nil {
 			return err
 		}
 	}
 
+	if opts.Gutter != nil && uniseg.StringWidth(*opts.Gutter) != 1 ||
+		opts.GutterRaw != nil && uniseg.StringWidth(*opts.GutterRaw) != 1 {
+		return errors.New("gutter display width should be 1")
+	}
+
 	if opts.Scrollbar != nil {
 		runes := []rune(*opts.Scrollbar)
 		if len(runes) > 2 {
@@ -3464,23 +3633,6 @@ func postProcessOptions(opts *Options) error {
 		}
 	}
 
-	if opts.Bold {
-		theme := opts.Theme
-		boldify := func(c tui.ColorAttr) tui.ColorAttr {
-			dup := c
-			if (c.Attr & tui.AttrRegular) == 0 {
-				dup.Attr |= tui.BoldForce
-			}
-			return dup
-		}
-		theme.Current = boldify(theme.Current)
-		theme.CurrentMatch = boldify(theme.CurrentMatch)
-		theme.Prompt = boldify(theme.Prompt)
-		theme.Input = boldify(theme.Input)
-		theme.Cursor = boldify(theme.Cursor)
-		theme.Spinner = boldify(theme.Spinner)
-	}
-
 	// If --height option is not supported on the platform, just ignore it
 	if !tui.IsLightRendererSupported() && opts.Height.size > 0 {
 		opts.Height = heightSpec{}

src/options_test.go

@@ -300,8 +300,12 @@ func TestBind(t *testing.T) {
 }
 
 func TestColorSpec(t *testing.T) {
+	var base *tui.ColorTheme
 	theme := tui.Dark256
-	dark, _ := parseTheme(theme, "dark")
+	base, dark, _ := parseTheme(theme, "dark")
+	if *dark != *base {
+		t.Errorf("incorrect base theme returned")
+	}
 	if *dark != *theme {
 		t.Errorf("colors should be equivalent")
 	}
@@ -309,7 +313,10 @@ func TestColorSpec(t *testing.T) {
 		t.Errorf("point should not be equivalent")
 	}
 
-	light, _ := parseTheme(theme, "dark,light")
+	base, light, _ := parseTheme(theme, "dark,light")
+	if *light != *base {
+		t.Errorf("incorrect base theme returned")
+	}
 	if *light == *theme {
 		t.Errorf("should not be equivalent")
 	}
@@ -320,7 +327,7 @@ func TestColorSpec(t *testing.T) {
 		t.Errorf("point should not be equivalent")
 	}
 
-	customized, _ := parseTheme(theme, "fg:231,bg:232")
+	_, customized, _ := parseTheme(theme, "fg:231,bg:232")
 	if customized.Fg.Color != 231 || customized.Bg.Color != 232 {
 		t.Errorf("color not customized")
 	}
@@ -333,7 +340,7 @@ func TestColorSpec(t *testing.T) {
 		t.Errorf("colors should now be equivalent: %v, %v", tui.Dark256, customized)
 	}
 
-	customized, _ = parseTheme(theme, "fg:231,dark   bg:232")
+	_, customized, _ = parseTheme(theme, "fg:231,dark   bg:232")
 	if customized.Fg != tui.Dark256.Fg || customized.Bg == tui.Dark256.Bg {
 		t.Errorf("color not customized")
 	}
@@ -350,8 +357,8 @@ func TestDefaultCtrlNP(t *testing.T) {
 			t.Error()
 		}
 	}
-	check([]string{}, tui.CtrlN, actDown)
+	check([]string{}, tui.CtrlN, actDownMatch)
-	check([]string{}, tui.CtrlP, actUp)
+	check([]string{}, tui.CtrlP, actUpMatch)
 
 	check([]string{"--bind=ctrl-n:accept"}, tui.CtrlN, actAccept)
 	check([]string{"--bind=ctrl-p:accept"}, tui.CtrlP, actAccept)
@@ -462,7 +469,7 @@ func TestValidateSign(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		err := validateSign(testCase.inputSign, "")
+		err := validateSign(testCase.inputSign, "", 2)
 		if testCase.isValid && err != nil {
 			t.Errorf("Input sign `%s` caused error", testCase.inputSign)
 		}

src/result.go

@@ -123,7 +123,7 @@ func minRank() Result {
 	return Result{item: &minItem, points: [4]uint16{math.MaxUint16, 0, 0, 0}}
 }
 
-func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, theme *tui.ColorTheme, colBase tui.ColorPair, colMatch tui.ColorPair, attrNth tui.Attr) []colorOffset {
+func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, theme *tui.ColorTheme, colBase tui.ColorPair, colMatch tui.ColorPair, attrNth tui.Attr, hidden bool) []colorOffset {
 	itemColors := result.item.Colors()
 
 	// No ANSI codes
@@ -194,6 +194,10 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 		if !theme.Colored {
 			return tui.NewColorPair(-1, -1, ansi.color.attr).MergeAttr(base)
 		}
+		// fd --color always | fzf --ansi --delimiter / --nth -1 --color fg:dim:strip,nth:regular
+		if base.ShouldStripColors() {
+			return base
+		}
 		fg := ansi.color.fg
 		bg := ansi.color.bg
 		if fg == -1 {
@@ -251,6 +255,9 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 				if curr.nth {
 					base = base.WithAttr(attrNth)
 				}
+				if hidden {
+					base = base.WithFg(theme.Nomatch)
+				}
 				color := ansiToColorPair(ansi, base)
 				colors = append(colors, colorOffset{
 					offset: [2]int32{int32(start), int32(idx)},
@@ -258,9 +265,13 @@ func (result *Result) colorOffsets(matchOffsets []Offset, nthOffsets []Offset, t
 					match:  false,
 					url:    ansi.color.url})
 			} else {
+				color := colBase.WithAttr(attrNth)
+				if hidden {
+					color = color.WithFg(theme.Nomatch)
+				}
 				colors = append(colors, colorOffset{
 					offset: [2]int32{int32(start), int32(idx)},
-					color:  colBase.WithAttr(attrNth),
+					color:  color,
 					match:  false,
 					url:    nil})
 			}

src/result_test.go

@@ -131,7 +131,7 @@ func TestColorOffset(t *testing.T) {
 
 	colBase := tui.NewColorPair(89, 189, tui.AttrUndefined)
 	colMatch := tui.NewColorPair(99, 199, tui.AttrUndefined)
-	colors := item.colorOffsets(offsets, nil, tui.Dark256, colBase, colMatch, tui.AttrUndefined)
+	colors := item.colorOffsets(offsets, nil, tui.Dark256, colBase, colMatch, tui.AttrUndefined, false)
 	assert := func(idx int, b int32, e int32, c tui.ColorPair) {
 		o := colors[idx]
 		if o.offset[0] != b || o.offset[1] != e || o.color != c {
@@ -158,7 +158,7 @@ func TestColorOffset(t *testing.T) {
 
 	nthOffsets := []Offset{{37, 39}, {42, 45}}
 	for _, attr := range []tui.Attr{tui.AttrRegular, tui.StrikeThrough} {
-		colors = item.colorOffsets(offsets, nthOffsets, tui.Dark256, colRegular, colUnderline, attr)
+		colors = item.colorOffsets(offsets, nthOffsets, tui.Dark256, colRegular, colUnderline, attr, false)
 
 		// [{[0 5] {1 5 0}} {[5 15] {1 5 8}} {[15 20] {1 5 0}}
 		//  {[22 25] {2 6 1}} {[25 27] {2 6 9}} {[27 30] {-1 -1 8}}

src/server.go

@@ -46,15 +46,20 @@ type httpServer struct {
 type listenAddress struct {
 	host string
 	port int
+	sock string
 }
 
 func (addr listenAddress) IsLocal() bool {
-	return addr.host == "localhost" || addr.host == "127.0.0.1"
+	return addr.host == "localhost" || addr.host == "127.0.0.1" || len(addr.sock) > 0
 }
 
-var defaultListenAddr = listenAddress{"localhost", 0}
+var defaultListenAddr = listenAddress{"localhost", 0, ""}
 
 func parseListenAddress(address string) (listenAddress, error) {
+	if strings.HasSuffix(address, ".sock") {
+		return listenAddress{"", 0, address}, nil
+	}
+
 	parts := strings.SplitN(address, ":", 3)
 	if len(parts) == 1 {
 		parts = []string{"localhost", parts[0]}
@@ -70,7 +75,7 @@ func parseListenAddress(address string) (listenAddress, error) {
 	if len(parts[0]) == 0 {
 		parts[0] = "localhost"
 	}
-	return listenAddress{parts[0], port}, nil
+	return listenAddress{parts[0], port, ""}, nil
 }
 
 func startHttpServer(address listenAddress, actionChannel chan []*action, getHandler func(getParams) string) (net.Listener, int, error) {
@@ -80,8 +85,26 @@ func startHttpServer(address listenAddress, actionChannel chan []*action, getHan
 	if !address.IsLocal() && len(apiKey) == 0 {
 		return nil, port, errors.New("FZF_API_KEY is required to allow remote access")
 	}
+
+	var listener net.Listener
+	var err error
+	if len(address.sock) > 0 {
+		if _, err := os.Stat(address.sock); err == nil {
+			// Check if the socket is already in use
+			if conn, err := net.Dial("unix", address.sock); err == nil {
+				conn.Close()
+				return nil, 0, fmt.Errorf("socket already in use: %s", address.sock)
+			}
+			os.Remove(address.sock)
+		}
+		listener, err = net.Listen("unix", address.sock)
+		if err != nil {
+			return nil, 0, fmt.Errorf("failed to listen on %s", address.sock)
+		}
+		os.Chmod(address.sock, 0600)
+	} else {
 		addrStr := fmt.Sprintf("%s:%d", host, port)
-	listener, err := net.Listen("tcp", addrStr)
+		listener, err = net.Listen("tcp", addrStr)
 		if err != nil {
 			return nil, port, fmt.Errorf("failed to listen on %s", addrStr)
 		}
@@ -97,6 +120,7 @@ func startHttpServer(address listenAddress, actionChannel chan []*action, getHan
 				return nil, port, err
 			}
 		}
+	}
 
 	server := httpServer{
 		apiKey:        []byte(apiKey),

src/terminal.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"maps"
 	"math"
 	"net"
 	"os"
@@ -179,6 +180,7 @@ type itemLine struct {
 	result    Result
 	empty     bool
 	other     bool
+	hidden    bool
 }
 
 func (t *Terminal) inListWindow() bool {
@@ -272,9 +274,12 @@ type Terminal struct {
 	footerLabel        labelPrinter
 	footerLabelLen     int
 	footerLabelOpts    labelOpts
+	gutterReverse      bool
+	gutterRawReverse   bool
 	pointer            string
 	pointerLen         int
 	pointerEmpty       string
+	pointerEmptyRaw    string
 	marker             string
 	markerLen          int
 	markerEmpty        string
@@ -291,6 +296,8 @@ type Terminal struct {
 	gapLineLen         int
 	wordRubout         string
 	wordNext           string
+	subWordRubout      string
+	subWordNext        string
 	cx                 int
 	cy                 int
 	offset             int
@@ -379,6 +386,9 @@ type Terminal struct {
 	printer            func(string)
 	printsep           string
 	merger             *Merger
+	passMerger         *Merger
+	resultMerger       *Merger
+	matchMap           map[int32]Result
 	selected           map[int32]selectedItem
 	version            int64
 	revision           revision
@@ -397,7 +407,6 @@ type Terminal struct {
 	initFunc           func() error
 	prevLines          []itemLine
 	suppress           bool
-	sigstop            bool
 	startChan          chan fitpad
 	killChan           chan bool
 	serverInputChan    chan []*action
@@ -426,6 +435,7 @@ type Terminal struct {
 	clickFooterColumn  int
 	proxyScript        string
 	numLinesCache      map[int32]numLinesCacheValue
+	raw                bool
 }
 
 type numLinesCacheValue struct {
@@ -512,6 +522,7 @@ const (
 	actBackwardDeleteChar
 	actBackwardDeleteCharEof
 	actBackwardWord
+	actBackwardSubWord
 	actCancel
 
 	actChangeBorderLabel
@@ -541,12 +552,15 @@ const (
 	actFatal
 	actForwardChar
 	actForwardWord
+	actForwardSubWord
 	actKillLine
 	actKillWord
+	actKillSubWord
 	actUnixLineDiscard
 	actUnixWordRubout
 	actYank
 	actBackwardKillWord
+	actBackwardKillSubWord
 	actSelectAll
 	actDeselectAll
 	actToggle
@@ -562,13 +576,18 @@ const (
 	actToggleWrap
 	actToggleMultiLine
 	actToggleHscroll
+	actToggleRaw
+	actEnableRaw
+	actDisableRaw
 	actTrackCurrent
 	actToggleInput
 	actHideInput
 	actShowInput
 	actUntrackCurrent
 	actDown
+	actDownMatch
 	actUp
+	actUpMatch
 	actPageUp
 	actPageDown
 	actPosition
@@ -644,6 +663,7 @@ const (
 	actExecuteSilent
 	actExecuteMulti // Deprecated
 	actSigStop
+	actBest
 	actFirst
 	actLast
 	actReload
@@ -782,14 +802,17 @@ func defaultKeymap() map[tui.Event][]*action {
 	add(tui.CtrlF, actForwardChar)
 	add(tui.CtrlH, actBackwardDeleteChar)
 	add(tui.Backspace, actBackwardDeleteChar)
+	add(tui.CtrlBackspace, actBackwardDeleteChar)
 	add(tui.Tab, actToggleDown)
 	add(tui.ShiftTab, actToggleUp)
 	add(tui.CtrlJ, actDown)
 	add(tui.CtrlK, actUp)
 	add(tui.CtrlL, actClearScreen)
 	add(tui.Enter, actAccept)
-	add(tui.CtrlN, actDown)
+	add(tui.CtrlN, actDownMatch)
-	add(tui.CtrlP, actUp)
+	add(tui.CtrlP, actUpMatch)
+	add(tui.AltDown, actDownMatch)
+	add(tui.AltUp, actUpMatch)
 	add(tui.CtrlU, actUnixLineDiscard)
 	add(tui.CtrlW, actUnixWordRubout)
 	add(tui.CtrlY, actYank)
@@ -936,16 +959,16 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 	}
 	wordRubout := "[^\\pL\\pN][\\pL\\pN]"
 	wordNext := "[\\pL\\pN][^\\pL\\pN]|(.$)"
+	subWordRubout := "[a-z][A-Z]|[^\\pL\\pN][\\pL\\pN]"
+	subWordNext := "[a-z][A-Z]|[\\pL\\pN][^\\pL\\pN]|(.$)"
 	if opts.FileWord {
 		sep := regexp.QuoteMeta(string(os.PathSeparator))
 		wordRubout = fmt.Sprintf("%s[^%s]", sep, sep)
 		wordNext = fmt.Sprintf("[^%s]%s|(.$)", sep, sep)
 	}
-	keymapCopy := make(map[tui.Event][]*action)
+	keymapCopy := maps.Clone(opts.Keymap)
-	for key, action := range opts.Keymap {
-		keymapCopy[key] = action
-	}
 
+	em := EmptyMerger(revision{})
 	t := Terminal{
 		initDelay:          delay,
 		infoCommand:        opts.InfoCommand,
@@ -969,6 +992,8 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		markerMultiLine:    *opts.MarkerMulti,
 		wordRubout:         wordRubout,
 		wordNext:           wordNext,
+		subWordRubout:      subWordRubout,
+		subWordNext:        subWordNext,
 		cx:                 len(input),
 		cy:                 0,
 		offset:             0,
@@ -1030,6 +1055,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		nth:                opts.Nth,
 		nthCurrent:         opts.Nth,
 		tabstop:            opts.Tabstop,
+		raw:                opts.Raw,
 		hasStartActions:    false,
 		hasResultActions:   false,
 		hasFocusActions:    false,
@@ -1043,7 +1069,10 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		printer:            opts.Printer,
 		printsep:           opts.PrintSep,
 		proxyScript:        opts.ProxyScript,
-		merger:             EmptyMerger(revision{}),
+		merger:             em,
+		passMerger:         em,
+		resultMerger:       em,
+		matchMap:           make(map[int32]Result),
 		selected:           make(map[int32]selectedItem),
 		runningCmds:        util.NewConcurrentSet[*runningCmd](),
 		reqBox:             util.NewEventBox(),
@@ -1080,13 +1109,45 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		t.acceptNth = opts.AcceptNth(t.delimiter)
 	}
 
+	baseTheme := opts.BaseTheme
+	if baseTheme == nil {
+		baseTheme = renderer.DefaultTheme()
+	}
 	// This should be called before accessing tui.Color*
-	tui.InitTheme(opts.Theme, renderer.DefaultTheme(), opts.Black, opts.InputBorderShape.Visible(), opts.HeaderBorderShape.Visible())
+	tui.InitTheme(opts.Theme, baseTheme, opts.Bold, opts.Black, opts.InputBorderShape.Visible(), opts.HeaderBorderShape.Visible())
+
+	// Gutter character
+	var gutterChar, gutterRawChar string
+	if opts.Gutter != nil {
+		gutterChar = *opts.Gutter
+	} else if t.unicode {
+		gutterChar = "▌"
+	} else {
+		gutterChar = " "
+		t.gutterReverse = true
+	}
+
+	if opts.GutterRaw != nil {
+		gutterRawChar = *opts.GutterRaw
+	} else if t.unicode {
+		gutterRawChar = "▖"
+	} else {
+		gutterRawChar = ":"
+		t.gutterRawReverse = false
+	}
 
 	t.prompt, t.promptLen = t.parsePrompt(opts.Prompt)
 	// Pre-calculated empty pointer and marker signs
-	t.pointerEmpty = strings.Repeat(" ", t.pointerLen)
+	if t.pointerLen == 0 {
+		t.pointerEmpty = ""
+		t.pointerEmptyRaw = ""
+	} else {
+		t.pointerEmpty = gutterChar + strings.Repeat(" ", util.Max(0, t.pointerLen-1))
+		t.pointerEmptyRaw = gutterRawChar + strings.Repeat(" ", util.Max(0, t.pointerLen-1))
+	}
 	t.markerEmpty = strings.Repeat(" ", t.markerLen)
+
+	// Labels
 	t.listLabel, t.listLabelLen = t.ansiLabelPrinter(opts.ListLabel.label, &tui.ColListLabel, false)
 	t.borderLabel, t.borderLabelLen = t.ansiLabelPrinter(opts.BorderLabel.label, &tui.ColBorderLabel, false)
 	t.previewLabel, t.previewLabelLen = t.ansiLabelPrinter(opts.PreviewLabel.label, &tui.ColPreviewLabel, false)
@@ -1207,8 +1268,10 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 			return nil, err
 		}
 		t.listener = listener
+		if port > 0 {
 			t.listenPort = &port
 		}
+	}
 
 	if t.hasStartActions {
 		t.eventChan <- tui.Start.AsEvent()
@@ -1231,6 +1294,9 @@ func (t *Terminal) environForPreview() []string {
 
 func (t *Terminal) environImpl(forPreview bool) []string {
 	env := os.Environ()
+	if t.listenAddr != nil && len(t.listenAddr.sock) > 0 {
+		env = append(env, "FZF_SOCK="+t.listenAddr.sock)
+	}
 	if t.listenPort != nil {
 		env = append(env, fmt.Sprintf("FZF_PORT=%d", *t.listenPort))
 	}
@@ -1245,9 +1311,21 @@ func (t *Terminal) environImpl(forPreview bool) []string {
 	env = append(env, "FZF_LIST_LABEL="+t.listLabelOpts.label)
 	env = append(env, "FZF_INPUT_LABEL="+t.inputLabelOpts.label)
 	env = append(env, "FZF_HEADER_LABEL="+t.headerLabelOpts.label)
+	direction := "down"
+	if t.layout == layoutDefault {
+		direction = "up"
+	}
+	env = append(env, "FZF_DIRECTION="+direction)
 	if len(t.nthCurrent) > 0 {
 		env = append(env, "FZF_NTH="+RangesToString(t.nthCurrent))
 	}
+	if t.raw {
+		val := "0"
+		if t.isCurrentItemMatch() {
+			val = "1"
+		}
+		env = append(env, "FZF_RAW="+val)
+	}
 	inputState := "enabled"
 	if t.inputless {
 		inputState = "hidden"
@@ -1256,7 +1334,7 @@ func (t *Terminal) environImpl(forPreview bool) []string {
 	}
 	env = append(env, "FZF_INPUT_STATE="+inputState)
 	env = append(env, fmt.Sprintf("FZF_TOTAL_COUNT=%d", t.count))
-	env = append(env, fmt.Sprintf("FZF_MATCH_COUNT=%d", t.merger.Length()))
+	env = append(env, fmt.Sprintf("FZF_MATCH_COUNT=%d", t.resultMerger.Length()))
 	env = append(env, fmt.Sprintf("FZF_SELECT_COUNT=%d", len(t.selected)))
 	env = append(env, fmt.Sprintf("FZF_LINES=%d", t.areaLines))
 	env = append(env, fmt.Sprintf("FZF_COLUMNS=%d", t.areaColumns))
@@ -1417,7 +1495,7 @@ func (t *Terminal) ansiLabelPrinter(str string, color *tui.ColorPair, fill bool)
 	printFn := func(window tui.Window, limit int) {
 		if offsets == nil {
 			// tui.Col* are not initialized until renderer.Init()
-			offsets = result.colorOffsets(nil, nil, t.theme, *color, *color, t.nthAttr)
+			offsets = result.colorOffsets(nil, nil, t.theme, *color, *color, t.nthAttr, false)
 		}
 		for limit > 0 {
 			if length > limit {
@@ -1480,7 +1558,7 @@ func (t *Terminal) parsePrompt(prompt string) (func(), int) {
 				return 1
 			}
 			t.printHighlighted(
-				Result{item: item}, tui.ColPrompt, tui.ColPrompt, false, false, line, line, true, preTask, nil)
+				Result{item: item}, tui.ColPrompt, tui.ColPrompt, false, false, false, line, line, true, preTask, nil)
 		})
 		t.wrap = wrap
 	}
@@ -1667,7 +1745,8 @@ func (t *Terminal) UpdateProgress(progress float32) {
 }
 
 // UpdateList updates Merger to display the list
-func (t *Terminal) UpdateList(merger *Merger) {
+func (t *Terminal) UpdateList(result MatchResult) {
+	merger := result.merger
 	t.mutex.Lock()
 	prevIndex := minItem.Index()
 	newRevision := merger.Revision()
@@ -1680,6 +1759,15 @@ func (t *Terminal) UpdateList(merger *Merger) {
 	}
 	t.progress = 100
 	t.merger = merger
+	t.resultMerger = merger
+	t.passMerger = result.passMerger
+	if t.raw {
+		t.merger = result.passMerger
+		t.matchMap = t.resultMerger.ToMap()
+	} else {
+		t.merger = result.merger
+		t.matchMap = make(map[int32]Result)
+	}
 	if t.revision != newRevision {
 		if !t.revision.compatible(newRevision) {
 			// Reloaded: clear selection
@@ -1728,7 +1816,7 @@ func (t *Terminal) UpdateList(merger *Merger) {
 	}
 	needActivation := false
 	if !t.reading {
-		switch t.merger.Length() {
+		switch t.resultMerger.Length() {
 		case 0:
 			zero := tui.Zero.AsEvent()
 			if _, prs := t.keymap[zero]; prs {
@@ -2371,6 +2459,13 @@ func (t *Terminal) resizeWindows(forcePreview bool, redrawBorder bool) {
 			innerHeight-shrink, tui.WindowList, noBorder, true)
 	}
 
+	if len(t.scrollbar) == 0 {
+		for y := 0; y < t.window.Height(); y++ {
+			t.window.Move(y, t.window.Width()-1)
+			t.window.Print(" ")
+		}
+	}
+
 	createInnerWindow := func(b tui.Window, shape tui.BorderShape, windowType tui.WindowType, shift int) tui.Window {
 		top := b.Top()
 		left := b.Left() + shift
@@ -2768,7 +2863,7 @@ func (t *Terminal) printInfoImpl() {
 		return
 	}
 
-	found := t.merger.Length()
+	found := t.resultMerger.Length()
 	total := util.Max(found, t.count)
 	output := fmt.Sprintf("%d/%d", found, total)
 	if t.toggleSort {
@@ -2985,7 +3080,7 @@ func (t *Terminal) printFooter() {
 				colors: colors}
 
 			t.printHighlighted(Result{item: item},
-				tui.ColFooter, tui.ColFooter, false, false, line, line, true,
+				tui.ColFooter, tui.ColFooter, false, false, false, line, line, true,
 				func(markerClass) int {
 					t.footerWindow.Print(indent)
 					return indentSize
@@ -3057,7 +3152,7 @@ func (t *Terminal) printHeaderImpl(window tui.Window, borderShape tui.BorderShap
 			colors: colors}
 
 		t.printHighlighted(Result{item: item},
-			tui.ColHeader, tui.ColHeader, false, false, line, line, true,
+			tui.ColHeader, tui.ColHeader, false, false, false, line, line, true,
 			func(markerClass) int {
 				t.window.Print(indent)
 				return indentSize
@@ -3085,9 +3180,25 @@ func (t *Terminal) renderEmptyLine(line int, barRange [2]int) {
 	t.renderBar(line, barRange)
 }
 
+func (t *Terminal) gutter(current bool) {
+	var color tui.ColorPair
+	if current {
+		color = tui.ColCurrentCursorEmpty
+	} else if !t.raw && t.gutterReverse || t.raw && t.gutterRawReverse {
+		color = tui.ColCursorEmpty
+	} else {
+		color = tui.ColCursorEmptyChar
+	}
+	gutter := t.pointerEmpty
+	if t.raw {
+		gutter = t.pointerEmptyRaw
+	}
+	t.window.CPrint(color, gutter)
+}
+
 func (t *Terminal) renderGapLine(line int, barRange [2]int, drawLine bool) {
 	t.move(line, 0, false)
-	t.window.CPrint(tui.ColCursorEmpty, t.pointerEmpty)
+	t.gutter(false)
 	t.window.Print(t.markerEmpty)
 	x := t.pointerLen + t.markerLen
 
@@ -3117,7 +3228,8 @@ func (t *Terminal) printList() {
 	for line, itemCount := startLine, 0; line <= maxy; line, itemCount = line+1, itemCount+1 {
 		if itemCount < count {
 			item := t.merger.Get(itemCount + t.offset)
-			line = t.printItem(item, line, maxy, itemCount, itemCount == t.cy-t.offset, barRange)
+			current := itemCount == t.cy-t.offset
+			line = t.printItem(item, line, maxy, itemCount, current, barRange)
 		} else if !t.prevLines[line].empty {
 			t.renderEmptyLine(line, barRange)
 		}
@@ -3139,6 +3251,14 @@ func (t *Terminal) printBar(lineNum int, forceRedraw bool, barRange [2]int) bool
 
 func (t *Terminal) printItem(result Result, line int, maxLine int, index int, current bool, barRange [2]int) int {
 	item := result.item
+	matched := true
+	var matchResult Result
+	if t.raw {
+		if matchResult, matched = t.matchMap[item.Index()]; matched {
+			result = matchResult
+		}
+	}
+
 	_, selected := t.selected[item.Index()]
 	label := ""
 	extraWidth := 0
@@ -3169,7 +3289,7 @@ func (t *Terminal) printItem(result Result, line int, maxLine int, index int, cu
 	// Avoid unnecessary redraw
 	numLines, _ := t.numItemLines(item, maxLine-line+1)
 	newLine := itemLine{valid: true, firstLine: line, numLines: numLines, cy: index + t.offset, current: current, selected: selected, label: label,
-		result: result, queryLen: len(t.input), width: 0, hasBar: line >= barRange[0] && line < barRange[1]}
+		result: result, queryLen: len(t.input), width: 0, hasBar: line >= barRange[0] && line < barRange[1], hidden: !matched}
 	prevLine := t.prevLines[line]
 	forceRedraw := !prevLine.valid || prevLine.other || prevLine.firstLine != newLine.firstLine
 	printBar := func(lineNum int, forceRedraw bool) bool {
@@ -3177,6 +3297,7 @@ func (t *Terminal) printItem(result Result, line int, maxLine int, index int, cu
 	}
 
 	if !forceRedraw &&
+		prevLine.hidden == newLine.hidden &&
 		prevLine.numLines == newLine.numLines &&
 		prevLine.current == newLine.current &&
 		prevLine.selected == newLine.selected &&
@@ -3251,7 +3372,7 @@ func (t *Terminal) printItem(result Result, line int, maxLine int, index int, cu
 				return indentSize
 			}
 			if len(label) == 0 {
-				t.window.CPrint(tui.ColCurrentCursorEmpty, t.pointerEmpty)
+				t.gutter(true)
 			} else {
 				t.window.CPrint(tui.ColCurrentCursor, label)
 			}
@@ -3265,7 +3386,7 @@ func (t *Terminal) printItem(result Result, line int, maxLine int, index int, cu
 			}
 			return indentSize
 		}
-		finalLineNum = t.printHighlighted(result, tui.ColCurrent, tui.ColCurrentMatch, true, true, line, maxLine, forceRedraw, preTask, postTask)
+		finalLineNum = t.printHighlighted(result, tui.ColCurrent, tui.ColCurrentMatch, true, true, !matched, line, maxLine, forceRedraw, preTask, postTask)
 	} else {
 		preTask := func(marker markerClass) int {
 			w := t.window.Width() - t.pointerLen
@@ -3273,7 +3394,7 @@ func (t *Terminal) printItem(result Result, line int, maxLine int, index int, cu
 				return indentSize
 			}
 			if len(label) == 0 {
-				t.window.CPrint(tui.ColCursorEmpty, t.pointerEmpty)
+				t.gutter(false)
 			} else {
 				t.window.CPrint(tui.ColCursor, label)
 			}
@@ -3299,7 +3420,7 @@ func (t *Terminal) printItem(result Result, line int, maxLine int, index int, cu
 			base = base.WithBg(altBg)
 			match = match.WithBg(altBg)
 		}
-		finalLineNum = t.printHighlighted(result, base, match, false, true, line, maxLine, forceRedraw, preTask, postTask)
+		finalLineNum = t.printHighlighted(result, base, match, false, true, !matched, line, maxLine, forceRedraw, preTask, postTask)
 	}
 	for i := 0; i < t.gap && finalLineNum < maxLine; i++ {
 		finalLineNum++
@@ -3346,13 +3467,13 @@ func (t *Terminal) overflow(runes []rune, max int) bool {
 	return t.displayWidthWithLimit(runes, 0, max) > max
 }
 
-func (t *Terminal) printHighlighted(result Result, colBase tui.ColorPair, colMatch tui.ColorPair, current bool, match bool, lineNum int, maxLineNum int, forceRedraw bool, preTask func(markerClass) int, postTask func(int, int, bool, bool, tui.ColorPair)) int {
+func (t *Terminal) printHighlighted(result Result, colBase tui.ColorPair, colMatch tui.ColorPair, current bool, match bool, hidden bool, lineNum int, maxLineNum int, forceRedraw bool, preTask func(markerClass) int, postTask func(int, int, bool, bool, tui.ColorPair)) int {
 	var displayWidth int
 	item := result.item
 	matchOffsets := []Offset{}
 	var pos *[]int
-	if match && t.merger.pattern != nil {
+	if match && t.resultMerger.pattern != nil {
-		_, matchOffsets, pos = t.merger.pattern.MatchItem(item, true, t.slab)
+		_, matchOffsets, pos = t.resultMerger.pattern.MatchItem(item, true, t.slab)
 	}
 	charOffsets := matchOffsets
 	if pos != nil {
@@ -3384,7 +3505,7 @@ func (t *Terminal) printHighlighted(result Result, colBase tui.ColorPair, colMat
 		}
 		if !wholeCovered && t.nthAttr > 0 {
 			var tokens []Token
-			if item.transformed != nil && item.transformed.revision == t.merger.revision {
+			if item.transformed != nil && item.transformed.revision == t.resultMerger.revision {
 				tokens = item.transformed.tokens
 			} else {
 				tokens = Transform(Tokenize(item.text.ToString(), t.delimiter), t.nthCurrent)
@@ -3398,7 +3519,7 @@ func (t *Terminal) printHighlighted(result Result, colBase tui.ColorPair, colMat
 			sort.Sort(ByOrder(nthOffsets))
 		}
 	}
-	allOffsets := result.colorOffsets(charOffsets, nthOffsets, t.theme, colBase, colMatch, t.nthAttr)
+	allOffsets := result.colorOffsets(charOffsets, nthOffsets, t.theme, colBase, colMatch, t.nthAttr, hidden)
 
 	maxLines := 1
 	if t.canSpanMultiLines() {
@@ -3597,7 +3718,11 @@ func (t *Terminal) printHighlighted(result Result, colBase tui.ColorPair, colMat
 		}
 
 		if maxWidth > 0 {
-			t.printColoredString(t.window, line, offsets, colBase)
+			color := colBase
+			if hidden {
+				color = color.WithFg(t.theme.Nomatch)
+			}
+			t.printColoredString(t.window, line, offsets, color)
 		}
 		if postTask != nil {
 			postTask(actualLineNum, displayWidth, wasWrapped, forceRedraw, lbg)
@@ -3619,7 +3744,7 @@ func (t *Terminal) printColoredString(window tui.Window, text []rune, offsets []
 	for _, offset := range offsets {
 		b := util.Constrain32(offset.offset[0], index, maxOffset)
 		e := util.Constrain32(offset.offset[1], index, maxOffset)
-		if url != nil && offset.url == nil {
+		if url != nil && offset.url != url {
 			url = nil
 			window.LinkEnd()
 		}
@@ -4632,6 +4757,33 @@ func (t *Terminal) currentItem() *Item {
 	return nil
 }
 
+func (t *Terminal) isCurrentItemMatch() bool {
+	cnt := t.merger.Length()
+	if t.cy >= 0 && cnt > 0 && cnt > t.cy {
+		if !t.raw {
+			return true
+		}
+		item := t.merger.Get(t.cy).item
+		return t.isItemMatch(item)
+	}
+	return false
+}
+
+func (t *Terminal) isItemMatch(item *Item) bool {
+	_, matched := t.matchMap[item.Index()]
+	return matched
+}
+
+func (t *Terminal) filterSelected() {
+	filtered := make(map[int32]selectedItem)
+	for k, v := range t.selected {
+		if t.isItemMatch(v.item) {
+			filtered[k] = v
+		}
+	}
+	t.selected = filtered
+}
+
 func (t *Terminal) buildPlusList(template string, forcePlus bool) (bool, [3][]*Item) {
 	current := t.currentItem()
 	slot, plus, asterisk, forceUpdate := hasPreviewFlags(template)
@@ -5872,8 +6024,9 @@ func (t *Terminal) Loop() error {
 				}
 			case actSelectAll:
 				if t.multi > 0 {
-					for i := 0; i < t.merger.Length(); i++ {
+					// Limit the scope only to the matching items
-						if !t.selectItem(t.merger.Get(i).item) {
+					for i := 0; i < t.resultMerger.Length(); i++ {
+						if !t.selectItem(t.resultMerger.Get(i).item) {
 							break
 						}
 					}
@@ -5881,8 +6034,10 @@ func (t *Terminal) Loop() error {
 				}
 			case actDeselectAll:
 				if t.multi > 0 {
-					for i := 0; i < t.merger.Length() && len(t.selected) > 0; i++ {
+					// Also limit the scope only to the matching items, while this may
-						t.deselectItem(t.merger.Get(i).item)
+					// not be straightforward in raw mode.
+					for i := 0; i < t.resultMerger.Length() && len(t.selected) > 0; i++ {
+						t.deselectItem(t.resultMerger.Get(i).item)
 					}
 					req(reqList, reqInfo)
 				}
@@ -5910,17 +6065,17 @@ func (t *Terminal) Loop() error {
 			case actToggleAll:
 				if t.multi > 0 {
 					prevIndexes := make(map[int]struct{})
-					for i := 0; i < t.merger.Length() && len(t.selected) > 0; i++ {
+					for i := 0; i < t.resultMerger.Length() && len(t.selected) > 0; i++ {
-						item := t.merger.Get(i).item
+						item := t.resultMerger.Get(i).item
 						if _, found := t.selected[item.Index()]; found {
 							prevIndexes[i] = struct{}{}
 							t.deselectItem(item)
 						}
 					}
 
-					for i := 0; i < t.merger.Length(); i++ {
+					for i := 0; i < t.resultMerger.Length(); i++ {
 						if _, found := prevIndexes[i]; !found {
-							item := t.merger.Get(i).item
+							item := t.resultMerger.Get(i).item
 							if !t.selectItem(item) {
 								break
 							}
@@ -5948,11 +6103,88 @@ func (t *Terminal) Loop() error {
 					t.vmove(1, true)
 					req(reqList)
 				}
-			case actDown:
+			case actDown, actDownMatch, actUp, actUpMatch:
-				t.vmove(-1, true)
+				dir := -1
+				if a.t == actUp || a.t == actUpMatch {
+					dir = 1
+				}
+				if t.raw && (a.t == actDownMatch || a.t == actUpMatch) {
+					if t.resultMerger.Length() > 0 {
+						prevCy := t.cy
+						for t.vmove(dir, true) && !t.isCurrentItemMatch() {
+						}
+						if !t.isCurrentItemMatch() {
+							t.vset(prevCy)
+						}
+					}
+				} else {
+					t.vmove(dir, true)
+				}
 				req(reqList)
-			case actUp:
+			case actToggleRaw, actEnableRaw, actDisableRaw:
-				t.vmove(1, true)
+				prevRaw := t.raw
+				newRaw := t.raw
+				switch a.t {
+				case actEnableRaw:
+					newRaw = true
+				case actDisableRaw:
+					newRaw = false
+				case actToggleRaw:
+					newRaw = !t.raw
+				}
+				if prevRaw == newRaw {
+					break
+				}
+				prevPos := t.cy - t.offset
+				prevIndex := t.currentIndex()
+				if newRaw {
+					// Build matchMap if not available
+					if len(t.matchMap) == 0 {
+						t.matchMap = t.resultMerger.ToMap()
+					}
+					t.merger = t.passMerger
+				} else {
+					// Find the closest matching item
+					if !t.isCurrentItemMatch() && t.resultMerger.Length() > 1 {
+						distance := 0
+					Loop:
+						for {
+							distance++
+							checks := 0
+							for _, cy := range []int{t.cy + distance, t.cy - distance} {
+								if cy >= 0 && cy < t.merger.Length() {
+									checks++
+									item := t.merger.Get(cy).item
+									if t.isItemMatch(item) {
+										prevIndex = item.Index()
+										break Loop
+									}
+								}
+							}
+							if checks == 0 {
+								break
+							}
+						}
+					}
+
+					t.merger = t.resultMerger
+
+					// Need to remove non-matching items from the selection
+					if t.multi > 0 && len(t.selected) > 0 {
+						t.filterSelected()
+						req(reqInfo)
+					}
+				}
+				t.raw = newRaw
+
+				// Try to retain position
+				if prevIndex != minItem.Index() {
+					t.cy = util.Max(0, t.merger.FindIndex(prevIndex))
+					t.offset = t.cy - prevPos
+				}
+
+				// List needs to be rerendered
+				t.forceRerenderList()
 				req(reqList)
 			case actAccept:
 				req(reqClose)
@@ -5977,8 +6209,14 @@ func (t *Terminal) Loop() error {
 					t.version++
 					req(reqList, reqInfo)
 				}
-			case actFirst:
+			case actFirst, actBest:
+				if t.raw && a.t == actBest {
+					if t.resultMerger.Length() > 0 {
+						t.vset(t.merger.FindIndex(t.resultMerger.Get(0).item.Index()))
+					}
+				} else {
 					t.vset(0)
+				}
 				t.constrain()
 				req(reqList)
 			case actLast:
@@ -6020,6 +6258,11 @@ func (t *Terminal) Loop() error {
 				if t.cx > 0 {
 					t.rubout(t.wordRubout)
 				}
+			case actBackwardKillSubWord:
+				beof = len(t.input) == 0
+				if t.cx > 0 {
+					t.rubout(t.subWordRubout)
+				}
 			case actYank:
 				suffix := copySlice(t.input[t.cx:])
 				t.input = append(append(t.input[:t.cx], t.yanked...), suffix...)
@@ -6101,7 +6344,7 @@ func (t *Terminal) Loop() error {
 				if a.t == actOffsetDown {
 					diff = -1
 				}
-				if t.layout == layoutReverse {
+				if t.layout != layoutDefault {
 					diff *= -1
 				}
 				t.offset += diff
@@ -6109,7 +6352,7 @@ func (t *Terminal) Loop() error {
 				t.constrain()
 				if before != t.offset {
 					t.offset = before
-					if t.layout == layoutReverse {
+					if t.layout != layoutDefault {
 						diff *= -1
 					}
 					t.vmove(diff, false)
@@ -6131,6 +6374,10 @@ func (t *Terminal) Loop() error {
 				t.cx = findLastMatch(t.wordRubout, string(t.input[:t.cx])) + 1
 			case actForwardWord:
 				t.cx += findFirstMatch(t.wordNext, string(t.input[t.cx:])) + 1
+			case actBackwardSubWord:
+				t.cx = findLastMatch(t.subWordRubout, string(t.input[:t.cx])) + 1
+			case actForwardSubWord:
+				t.cx += findFirstMatch(t.subWordNext, string(t.input[t.cx:])) + 1
 			case actKillWord:
 				ncx := t.cx +
 					findFirstMatch(t.wordNext, string(t.input[t.cx:])) + 1
@@ -6138,6 +6385,13 @@ func (t *Terminal) Loop() error {
 					t.yanked = copySlice(t.input[t.cx:ncx])
 					t.input = append(t.input[:t.cx], t.input[ncx:]...)
 				}
+			case actKillSubWord:
+				ncx := t.cx +
+					findFirstMatch(t.subWordNext, string(t.input[t.cx:])) + 1
+				if ncx > t.cx {
+					t.yanked = copySlice(t.input[t.cx:ncx])
+					t.input = append(t.input[:t.cx], t.input[ncx:]...)
+				}
 			case actKillLine:
 				if t.cx < len(t.input) {
 					t.yanked = copySlice(t.input[t.cx:])
@@ -6780,7 +7034,7 @@ func (t *Terminal) Loop() error {
 		reload := changed || newCommand != nil
 		var reloadRequest *searchRequest
 		if reload {
-			reloadRequest = &searchRequest{sort: t.sort, sync: reloadSync, nth: newNth, command: newCommand, environ: t.environ(), changed: changed, denylist: denylist, revision: t.merger.Revision()}
+			reloadRequest = &searchRequest{sort: t.sort, sync: reloadSync, nth: newNth, command: newCommand, environ: t.environ(), changed: changed, denylist: denylist, revision: t.resultMerger.Revision()}
 		}
 
 		// Dispatch queued background requests
@@ -6900,7 +7154,8 @@ func (t *Terminal) constrain() {
 	}
 }
 
-func (t *Terminal) vmove(o int, allowCycle bool) {
+// Returns true if the cursor position is successfully updated
+func (t *Terminal) vmove(o int, allowCycle bool) bool {
 	if t.layout != layoutDefault {
 		o *= -1
 	}
@@ -6917,7 +7172,7 @@ func (t *Terminal) vmove(o int, allowCycle bool) {
 			}
 		}
 	}
-	t.vset(dest)
+	return t.vset(dest)
 }
 
 func (t *Terminal) vset(o int) bool {
@@ -6984,9 +7239,9 @@ func (t *Terminal) dumpStatus(params getParams) string {
 		selected[i] = t.dumpItem(selectedItems[i+params.offset].item)
 	}
 
-	matches := make([]StatusItem, util.Max(0, util.Min(params.limit, t.merger.Length()-params.offset)))
+	matches := make([]StatusItem, util.Max(0, util.Min(params.limit, t.resultMerger.Length()-params.offset)))
 	for i := range matches {
-		matches[i] = t.dumpItem(t.merger.Get(i + params.offset).item)
+		matches[i] = t.dumpItem(t.resultMerger.Get(i + params.offset).item)
 	}
 
 	var current *StatusItem
@@ -7003,7 +7258,7 @@ func (t *Terminal) dumpStatus(params getParams) string {
 		Position:   t.cy,
 		Sort:       t.sort,
 		TotalCount: t.count,
-		MatchCount: t.merger.Length(),
+		MatchCount: t.resultMerger.Length(),
 		Current:    current,
 		Matches:    matches,
 		Selected:   selected,

src/tui/dummy.go

@@ -2,30 +2,7 @@
 
 package tui
 
-type Attr int32
-
-func HasFullscreenRenderer() bool {
-	return false
-}
-
-var DefaultBorderShape = BorderRounded
-
-func (a Attr) Merge(b Attr) Attr {
-	if b&AttrRegular > 0 {
-		// Only keep bold attribute set by the system
-		return (b &^ AttrRegular) | (a & BoldForce)
-	}
-
-	return (a &^ AttrRegular) | b
-}
-
 const (
-	AttrUndefined = Attr(0)
-	AttrRegular   = Attr(1 << 8)
-	AttrClear     = Attr(1 << 9)
-	BoldForce     = Attr(1 << 10)
-	FullBg        = Attr(1 << 11)
-
 	Bold          = Attr(1)
 	Dim           = Attr(1 << 1)
 	Italic        = Attr(1 << 2)
@@ -36,6 +13,12 @@ const (
 	StrikeThrough = Attr(1 << 7)
 )
 
+func HasFullscreenRenderer() bool {
+	return false
+}
+
+var DefaultBorderShape = BorderRounded
+
 func (r *FullscreenRenderer) Init() error                        { return nil }
 func (r *FullscreenRenderer) DefaultTheme() *ColorTheme          { return nil }
 func (r *FullscreenRenderer) Resize(maxHeightFunc func(int) int) {}

src/tui/eventtype_string.go

@@ -37,86 +37,137 @@ func _() {
 	_ = x[CtrlZ-26]
 	_ = x[Esc-27]
 	_ = x[CtrlSpace-28]
-	_ = x[CtrlDelete-29]
+	_ = x[CtrlBackSlash-29]
-	_ = x[CtrlBackSlash-30]
+	_ = x[CtrlRightBracket-30]
-	_ = x[CtrlRightBracket-31]
+	_ = x[CtrlCaret-31]
-	_ = x[CtrlCaret-32]
+	_ = x[CtrlSlash-32]
-	_ = x[CtrlSlash-33]
+	_ = x[ShiftTab-33]
-	_ = x[ShiftTab-34]
+	_ = x[Backspace-34]
-	_ = x[Backspace-35]
+	_ = x[Delete-35]
-	_ = x[Delete-36]
+	_ = x[PageUp-36]
-	_ = x[PageUp-37]
+	_ = x[PageDown-37]
-	_ = x[PageDown-38]
+	_ = x[Up-38]
-	_ = x[Up-39]
+	_ = x[Down-39]
-	_ = x[Down-40]
+	_ = x[Left-40]
-	_ = x[Left-41]
+	_ = x[Right-41]
-	_ = x[Right-42]
+	_ = x[Home-42]
-	_ = x[Home-43]
+	_ = x[End-43]
-	_ = x[End-44]
+	_ = x[Insert-44]
-	_ = x[Insert-45]
+	_ = x[ShiftUp-45]
-	_ = x[ShiftUp-46]
+	_ = x[ShiftDown-46]
-	_ = x[ShiftDown-47]
+	_ = x[ShiftLeft-47]
-	_ = x[ShiftLeft-48]
+	_ = x[ShiftRight-48]
-	_ = x[ShiftRight-49]
+	_ = x[ShiftDelete-49]
-	_ = x[ShiftDelete-50]
+	_ = x[ShiftHome-50]
-	_ = x[F1-51]
+	_ = x[ShiftEnd-51]
-	_ = x[F2-52]
+	_ = x[ShiftPageUp-52]
-	_ = x[F3-53]
+	_ = x[ShiftPageDown-53]
-	_ = x[F4-54]
+	_ = x[F1-54]
-	_ = x[F5-55]
+	_ = x[F2-55]
-	_ = x[F6-56]
+	_ = x[F3-56]
-	_ = x[F7-57]
+	_ = x[F4-57]
-	_ = x[F8-58]
+	_ = x[F5-58]
-	_ = x[F9-59]
+	_ = x[F6-59]
-	_ = x[F10-60]
+	_ = x[F7-60]
-	_ = x[F11-61]
+	_ = x[F8-61]
-	_ = x[F12-62]
+	_ = x[F9-62]
-	_ = x[AltBackspace-63]
+	_ = x[F10-63]
-	_ = x[AltUp-64]
+	_ = x[F11-64]
-	_ = x[AltDown-65]
+	_ = x[F12-65]
-	_ = x[AltLeft-66]
+	_ = x[AltBackspace-66]
-	_ = x[AltRight-67]
+	_ = x[AltUp-67]
-	_ = x[AltShiftUp-68]
+	_ = x[AltDown-68]
-	_ = x[AltShiftDown-69]
+	_ = x[AltLeft-69]
-	_ = x[AltShiftLeft-70]
+	_ = x[AltRight-70]
-	_ = x[AltShiftRight-71]
+	_ = x[AltDelete-71]
-	_ = x[Alt-72]
+	_ = x[AltHome-72]
-	_ = x[CtrlAlt-73]
+	_ = x[AltEnd-73]
-	_ = x[Invalid-74]
+	_ = x[AltPageUp-74]
-	_ = x[Fatal-75]
+	_ = x[AltPageDown-75]
-	_ = x[BracketedPasteBegin-76]
+	_ = x[AltShiftUp-76]
-	_ = x[BracketedPasteEnd-77]
+	_ = x[AltShiftDown-77]
-	_ = x[Mouse-78]
+	_ = x[AltShiftLeft-78]
-	_ = x[DoubleClick-79]
+	_ = x[AltShiftRight-79]
-	_ = x[LeftClick-80]
+	_ = x[AltShiftDelete-80]
-	_ = x[RightClick-81]
+	_ = x[AltShiftHome-81]
-	_ = x[SLeftClick-82]
+	_ = x[AltShiftEnd-82]
-	_ = x[SRightClick-83]
+	_ = x[AltShiftPageUp-83]
-	_ = x[ScrollUp-84]
+	_ = x[AltShiftPageDown-84]
-	_ = x[ScrollDown-85]
+	_ = x[CtrlUp-85]
-	_ = x[SScrollUp-86]
+	_ = x[CtrlDown-86]
-	_ = x[SScrollDown-87]
+	_ = x[CtrlLeft-87]
-	_ = x[PreviewScrollUp-88]
+	_ = x[CtrlRight-88]
-	_ = x[PreviewScrollDown-89]
+	_ = x[CtrlHome-89]
-	_ = x[Resize-90]
+	_ = x[CtrlEnd-90]
-	_ = x[Change-91]
+	_ = x[CtrlBackspace-91]
-	_ = x[BackwardEOF-92]
+	_ = x[CtrlDelete-92]
-	_ = x[Start-93]
+	_ = x[CtrlPageUp-93]
-	_ = x[Load-94]
+	_ = x[CtrlPageDown-94]
-	_ = x[Focus-95]
+	_ = x[Alt-95]
-	_ = x[One-96]
+	_ = x[CtrlAlt-96]
-	_ = x[Zero-97]
+	_ = x[CtrlAltUp-97]
-	_ = x[Result-98]
+	_ = x[CtrlAltDown-98]
-	_ = x[Jump-99]
+	_ = x[CtrlAltLeft-99]
-	_ = x[JumpCancel-100]
+	_ = x[CtrlAltRight-100]
-	_ = x[ClickHeader-101]
+	_ = x[CtrlAltHome-101]
-	_ = x[ClickFooter-102]
+	_ = x[CtrlAltEnd-102]
-	_ = x[Multi-103]
+	_ = x[CtrlAltBackspace-103]
+	_ = x[CtrlAltDelete-104]
+	_ = x[CtrlAltPageUp-105]
+	_ = x[CtrlAltPageDown-106]
+	_ = x[CtrlShiftUp-107]
+	_ = x[CtrlShiftDown-108]
+	_ = x[CtrlShiftLeft-109]
+	_ = x[CtrlShiftRight-110]
+	_ = x[CtrlShiftHome-111]
+	_ = x[CtrlShiftEnd-112]
+	_ = x[CtrlShiftDelete-113]
+	_ = x[CtrlShiftPageUp-114]
+	_ = x[CtrlShiftPageDown-115]
+	_ = x[CtrlAltShiftUp-116]
+	_ = x[CtrlAltShiftDown-117]
+	_ = x[CtrlAltShiftLeft-118]
+	_ = x[CtrlAltShiftRight-119]
+	_ = x[CtrlAltShiftHome-120]
+	_ = x[CtrlAltShiftEnd-121]
+	_ = x[CtrlAltShiftDelete-122]
+	_ = x[CtrlAltShiftPageUp-123]
+	_ = x[CtrlAltShiftPageDown-124]
+	_ = x[Invalid-125]
+	_ = x[Fatal-126]
+	_ = x[BracketedPasteBegin-127]
+	_ = x[BracketedPasteEnd-128]
+	_ = x[Mouse-129]
+	_ = x[DoubleClick-130]
+	_ = x[LeftClick-131]
+	_ = x[RightClick-132]
+	_ = x[SLeftClick-133]
+	_ = x[SRightClick-134]
+	_ = x[ScrollUp-135]
+	_ = x[ScrollDown-136]
+	_ = x[SScrollUp-137]
+	_ = x[SScrollDown-138]
+	_ = x[PreviewScrollUp-139]
+	_ = x[PreviewScrollDown-140]
+	_ = x[Resize-141]
+	_ = x[Change-142]
+	_ = x[BackwardEOF-143]
+	_ = x[Start-144]
+	_ = x[Load-145]
+	_ = x[Focus-146]
+	_ = x[One-147]
+	_ = x[Zero-148]
+	_ = x[Result-149]
+	_ = x[Jump-150]
+	_ = x[JumpCancel-151]
+	_ = x[ClickHeader-152]
+	_ = x[ClickFooter-153]
+	_ = x[Multi-154]
 }
 
-const _EventType_name = "RuneCtrlACtrlBCtrlCCtrlDCtrlECtrlFCtrlGCtrlHTabCtrlJCtrlKCtrlLEnterCtrlNCtrlOCtrlPCtrlQCtrlRCtrlSCtrlTCtrlUCtrlVCtrlWCtrlXCtrlYCtrlZEscCtrlSpaceCtrlDeleteCtrlBackSlashCtrlRightBracketCtrlCaretCtrlSlashShiftTabBackspaceDeletePageUpPageDownUpDownLeftRightHomeEndInsertShiftUpShiftDownShiftLeftShiftRightShiftDeleteF1F2F3F4F5F6F7F8F9F10F11F12AltBackspaceAltUpAltDownAltLeftAltRightAltShiftUpAltShiftDownAltShiftLeftAltShiftRightAltCtrlAltInvalidFatalBracketedPasteBeginBracketedPasteEndMouseDoubleClickLeftClickRightClickSLeftClickSRightClickScrollUpScrollDownSScrollUpSScrollDownPreviewScrollUpPreviewScrollDownResizeChangeBackwardEOFStartLoadFocusOneZeroResultJumpJumpCancelClickHeaderClickFooterMulti"
+const _EventType_name = "RuneCtrlACtrlBCtrlCCtrlDCtrlECtrlFCtrlGCtrlHTabCtrlJCtrlKCtrlLEnterCtrlNCtrlOCtrlPCtrlQCtrlRCtrlSCtrlTCtrlUCtrlVCtrlWCtrlXCtrlYCtrlZEscCtrlSpaceCtrlBackSlashCtrlRightBracketCtrlCaretCtrlSlashShiftTabBackspaceDeletePageUpPageDownUpDownLeftRightHomeEndInsertShiftUpShiftDownShiftLeftShiftRightShiftDeleteShiftHomeShiftEndShiftPageUpShiftPageDownF1F2F3F4F5F6F7F8F9F10F11F12AltBackspaceAltUpAltDownAltLeftAltRightAltDeleteAltHomeAltEndAltPageUpAltPageDownAltShiftUpAltShiftDownAltShiftLeftAltShiftRightAltShiftDeleteAltShiftHomeAltShiftEndAltShiftPageUpAltShiftPageDownCtrlUpCtrlDownCtrlLeftCtrlRightCtrlHomeCtrlEndCtrlBackspaceCtrlDeleteCtrlPageUpCtrlPageDownAltCtrlAltCtrlAltUpCtrlAltDownCtrlAltLeftCtrlAltRightCtrlAltHomeCtrlAltEndCtrlAltBackspaceCtrlAltDeleteCtrlAltPageUpCtrlAltPageDownCtrlShiftUpCtrlShiftDownCtrlShiftLeftCtrlShiftRightCtrlShiftHomeCtrlShiftEndCtrlShiftDeleteCtrlShiftPageUpCtrlShiftPageDownCtrlAltShiftUpCtrlAltShiftDownCtrlAltShiftLeftCtrlAltShiftRightCtrlAltShiftHomeCtrlAltShiftEndCtrlAltShiftDeleteCtrlAltShiftPageUpCtrlAltShiftPageDownInvalidFatalBracketedPasteBeginBracketedPasteEndMouseDoubleClickLeftClickRightClickSLeftClickSRightClickScrollUpScrollDownSScrollUpSScrollDownPreviewScrollUpPreviewScrollDownResizeChangeBackwardEOFStartLoadFocusOneZeroResultJumpJumpCancelClickHeaderClickFooterMulti"
 
-var _EventType_index = [...]uint16{0, 4, 9, 14, 19, 24, 29, 34, 39, 44, 47, 52, 57, 62, 67, 72, 77, 82, 87, 92, 97, 102, 107, 112, 117, 122, 127, 132, 135, 144, 154, 167, 183, 192, 201, 209, 218, 224, 230, 238, 240, 244, 248, 253, 257, 260, 266, 273, 282, 291, 301, 312, 314, 316, 318, 320, 322, 324, 326, 328, 330, 333, 336, 339, 351, 356, 363, 370, 378, 388, 400, 412, 425, 428, 435, 442, 447, 466, 483, 488, 499, 508, 518, 528, 539, 547, 557, 566, 577, 592, 609, 615, 621, 632, 637, 641, 646, 649, 653, 659, 663, 673, 684, 695, 700}
+var _EventType_index = [...]uint16{0, 4, 9, 14, 19, 24, 29, 34, 39, 44, 47, 52, 57, 62, 67, 72, 77, 82, 87, 92, 97, 102, 107, 112, 117, 122, 127, 132, 135, 144, 157, 173, 182, 191, 199, 208, 214, 220, 228, 230, 234, 238, 243, 247, 250, 256, 263, 272, 281, 291, 302, 311, 319, 330, 343, 345, 347, 349, 351, 353, 355, 357, 359, 361, 364, 367, 370, 382, 387, 394, 401, 409, 418, 425, 431, 440, 451, 461, 473, 485, 498, 512, 524, 535, 549, 565, 571, 579, 587, 596, 604, 611, 624, 634, 644, 656, 659, 666, 675, 686, 697, 709, 720, 730, 746, 759, 772, 787, 798, 811, 824, 838, 851, 863, 878, 893, 910, 924, 940, 956, 973, 989, 1004, 1022, 1040, 1060, 1067, 1072, 1091, 1108, 1113, 1124, 1133, 1143, 1153, 1164, 1172, 1182, 1191, 1202, 1217, 1234, 1240, 1246, 1257, 1262, 1266, 1271, 1274, 1278, 1284, 1288, 1298, 1309, 1320, 1325}
 
 func (i EventType) String() string {
 	if i < 0 || i >= EventType(len(_EventType_index)-1) {

src/tui/light.go

@@ -335,6 +335,8 @@ func (r *LightRenderer) GetChar() Event {
 		return Event{CtrlQ, 0, nil}
 	case 127:
 		return Event{Backspace, 0, nil}
+	case 8:
+		return Event{CtrlBackspace, 0, nil}
 	case 0:
 		return Event{CtrlSpace, 0, nil}
 	case 28:
@@ -381,6 +383,9 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 	}
 
 	*sz = 2
+	if r.buffer[1] == 8 {
+		return Event{CtrlAltBackspace, 0, nil}
+	}
 	if r.buffer[1] >= 1 && r.buffer[1] <= 'z'-'a'+1 {
 		return CtrlAltKey(rune(r.buffer[1] + 'a' - 1))
 	}
@@ -473,22 +478,139 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 				if r.buffer[3] == '~' {
 					return Event{Delete, 0, nil}
 				}
+				if len(r.buffer) == 7 && r.buffer[6] == '~' && r.buffer[4] == '1' {
+					*sz = 7
+					switch r.buffer[5] {
+					case '0':
+						return Event{AltShiftDelete, 0, nil}
+					case '1':
+						return Event{AltDelete, 0, nil}
+					case '2':
+						return Event{AltShiftDelete, 0, nil}
+					case '3':
+						return Event{CtrlAltDelete, 0, nil}
+					case '4':
+						return Event{CtrlAltShiftDelete, 0, nil}
+					case '5':
+						return Event{CtrlAltDelete, 0, nil}
+					case '6':
+						return Event{CtrlAltShiftDelete, 0, nil}
+					}
+				}
 				if len(r.buffer) == 6 && r.buffer[5] == '~' {
 					*sz = 6
 					switch r.buffer[4] {
-					case '5':
-						return Event{CtrlDelete, 0, nil}
 					case '2':
 						return Event{ShiftDelete, 0, nil}
+					case '3':
+						return Event{AltDelete, 0, nil}
+					case '4':
+						return Event{AltShiftDelete, 0, nil}
+					case '5':
+						return Event{CtrlDelete, 0, nil}
+					case '6':
+						return Event{CtrlShiftDelete, 0, nil}
+					case '7':
+						return Event{CtrlAltDelete, 0, nil}
+					case '8':
+						return Event{CtrlAltShiftDelete, 0, nil}
+					case '9':
+						return Event{AltDelete, 0, nil}
 					}
 				}
 				return Event{Invalid, 0, nil}
 			case '4':
 				return Event{End, 0, nil}
 			case '5':
+				if r.buffer[3] == '~' {
 					return Event{PageUp, 0, nil}
+				}
+				if len(r.buffer) == 7 && r.buffer[6] == '~' && r.buffer[4] == '1' {
+					*sz = 7
+					switch r.buffer[5] {
+					case '0':
+						return Event{AltShiftPageUp, 0, nil}
+					case '1':
+						return Event{AltPageUp, 0, nil}
+					case '2':
+						return Event{AltShiftPageUp, 0, nil}
+					case '3':
+						return Event{CtrlAltPageUp, 0, nil}
+					case '4':
+						return Event{CtrlAltShiftPageUp, 0, nil}
+					case '5':
+						return Event{CtrlAltPageUp, 0, nil}
 					case '6':
+						return Event{CtrlAltShiftPageUp, 0, nil}
+					}
+				}
+				if len(r.buffer) == 6 && r.buffer[5] == '~' {
+					*sz = 6
+					switch r.buffer[4] {
+					case '2':
+						return Event{ShiftPageUp, 0, nil}
+					case '3':
+						return Event{AltPageUp, 0, nil}
+					case '4':
+						return Event{AltShiftPageUp, 0, nil}
+					case '5':
+						return Event{CtrlPageUp, 0, nil}
+					case '6':
+						return Event{CtrlShiftPageUp, 0, nil}
+					case '7':
+						return Event{CtrlAltPageUp, 0, nil}
+					case '8':
+						return Event{CtrlAltShiftPageUp, 0, nil}
+					case '9':
+						return Event{AltPageUp, 0, nil}
+					}
+				}
+				return Event{Invalid, 0, nil}
+			case '6':
+				if r.buffer[3] == '~' {
 					return Event{PageDown, 0, nil}
+				}
+				if len(r.buffer) == 7 && r.buffer[6] == '~' && r.buffer[4] == '1' {
+					*sz = 7
+					switch r.buffer[5] {
+					case '0':
+						return Event{AltShiftPageDown, 0, nil}
+					case '1':
+						return Event{AltPageDown, 0, nil}
+					case '2':
+						return Event{AltShiftPageDown, 0, nil}
+					case '3':
+						return Event{CtrlAltPageDown, 0, nil}
+					case '4':
+						return Event{CtrlAltShiftPageDown, 0, nil}
+					case '5':
+						return Event{CtrlAltPageDown, 0, nil}
+					case '6':
+						return Event{CtrlAltShiftPageDown, 0, nil}
+					}
+				}
+				if len(r.buffer) == 6 && r.buffer[5] == '~' {
+					*sz = 6
+					switch r.buffer[4] {
+					case '2':
+						return Event{ShiftPageDown, 0, nil}
+					case '3':
+						return Event{AltPageDown, 0, nil}
+					case '4':
+						return Event{AltShiftPageDown, 0, nil}
+					case '5':
+						return Event{CtrlPageDown, 0, nil}
+					case '6':
+						return Event{CtrlShiftPageDown, 0, nil}
+					case '7':
+						return Event{CtrlAltPageDown, 0, nil}
+					case '8':
+						return Event{CtrlAltShiftPageDown, 0, nil}
+					case '9':
+						return Event{AltPageDown, 0, nil}
+					}
+				}
+				return Event{Invalid, 0, nil}
 			case '7':
 				return Event{Home, 0, nil}
 			case '8':
@@ -526,64 +648,173 @@ func (r *LightRenderer) escSequence(sz *int) Event {
 					}
 					*sz = 6
 					switch r.buffer[4] {
-					case '1', '2', '3', '4', '5':
+					case '1', '2', '3', '4', '5', '6', '7', '8', '9':
 						//                   Kitty      iTerm2     WezTerm
 						// SHIFT-ARROW       "\e[1;2D"
 						// ALT-SHIFT-ARROW   "\e[1;4D"  "\e[1;10D" "\e[1;4D"
 						// CTRL-SHIFT-ARROW  "\e[1;6D"             N/A
 						// CMD-SHIFT-ARROW   "\e[1;10D" N/A        N/A ("\e[1;2D")
-						alt := r.buffer[4] == '3'
+						ctrl := bytes.IndexByte([]byte{'5', '6', '7', '8'}, r.buffer[4]) >= 0
+						alt := bytes.IndexByte([]byte{'3', '4', '7', '8'}, r.buffer[4]) >= 0
+						shift := bytes.IndexByte([]byte{'2', '4', '6', '8'}, r.buffer[4]) >= 0
 						char := r.buffer[5]
-						altShift := false
+						if r.buffer[4] == '9' {
-						if r.buffer[4] == '1' && r.buffer[5] == '0' {
+							ctrl = false
-							altShift = true
+							alt = true
-							if len(r.buffer) < 7 {
+							shift = false
-								return Event{Invalid, 0, nil}
-							}
-							*sz = 7
-							char = r.buffer[6]
-						} else if r.buffer[4] == '4' {
-							altShift = true
 							if len(r.buffer) < 6 {
 								return Event{Invalid, 0, nil}
 							}
 							*sz = 6
 							char = r.buffer[5]
+						} else if r.buffer[4] == '1' && bytes.IndexByte([]byte{'0', '1', '2', '3', '4', '5', '6'}, r.buffer[5]) >= 0 {
+							ctrl = bytes.IndexByte([]byte{'3', '4', '5', '6'}, r.buffer[5]) >= 0
+							alt = true
+							shift = bytes.IndexByte([]byte{'0', '2', '4', '6'}, r.buffer[5]) >= 0
+							if len(r.buffer) < 7 {
+								return Event{Invalid, 0, nil}
 							}
+							*sz = 7
+							char = r.buffer[6]
+						}
+						ctrlShift := ctrl && shift
+						ctrlAlt := ctrl && alt
+						altShift := alt && shift
+						ctrlAltShift := ctrl && alt && shift
 						switch char {
 						case 'A':
-							if alt {
+							if ctrlAltShift {
-								return Event{AltUp, 0, nil}
+								return Event{CtrlAltShiftUp, 0, nil}
+							}
+							if ctrlAlt {
+								return Event{CtrlAltUp, 0, nil}
+							}
+							if ctrlShift {
+								return Event{CtrlShiftUp, 0, nil}
 							}
 							if altShift {
 								return Event{AltShiftUp, 0, nil}
 							}
-							return Event{ShiftUp, 0, nil}
+							if ctrl {
-						case 'B':
+								return Event{CtrlUp, 0, nil}
+							}
 							if alt {
-								return Event{AltDown, 0, nil}
+								return Event{AltUp, 0, nil}
+							}
+							if shift {
+								return Event{ShiftUp, 0, nil}
+							}
+						case 'B':
+							if ctrlAltShift {
+								return Event{CtrlAltShiftDown, 0, nil}
+							}
+							if ctrlAlt {
+								return Event{CtrlAltDown, 0, nil}
+							}
+							if ctrlShift {
+								return Event{CtrlShiftDown, 0, nil}
 							}
 							if altShift {
 								return Event{AltShiftDown, 0, nil}
 							}
-							return Event{ShiftDown, 0, nil}
+							if ctrl {
-						case 'C':
+								return Event{CtrlDown, 0, nil}
+							}
 							if alt {
-								return Event{AltRight, 0, nil}
+								return Event{AltDown, 0, nil}
+							}
+							if shift {
+								return Event{ShiftDown, 0, nil}
+							}
+						case 'C':
+							if ctrlAltShift {
+								return Event{CtrlAltShiftRight, 0, nil}
+							}
+							if ctrlAlt {
+								return Event{CtrlAltRight, 0, nil}
+							}
+							if ctrlShift {
+								return Event{CtrlShiftRight, 0, nil}
 							}
 							if altShift {
 								return Event{AltShiftRight, 0, nil}
 							}
+							if ctrl {
+								return Event{CtrlRight, 0, nil}
+							}
+							if shift {
 								return Event{ShiftRight, 0, nil}
-						case 'D':
+							}
 							if alt {
-								return Event{AltLeft, 0, nil}
+								return Event{AltRight, 0, nil}
+							}
+						case 'D':
+							if ctrlAltShift {
+								return Event{CtrlAltShiftLeft, 0, nil}
+							}
+							if ctrlAlt {
+								return Event{CtrlAltLeft, 0, nil}
+							}
+							if ctrlShift {
+								return Event{CtrlShiftLeft, 0, nil}
 							}
 							if altShift {
 								return Event{AltShiftLeft, 0, nil}
 							}
+							if ctrl {
+								return Event{CtrlLeft, 0, nil}
+							}
+							if alt {
+								return Event{AltLeft, 0, nil}
+							}
+							if shift {
 								return Event{ShiftLeft, 0, nil}
 							}
+						case 'H':
+							if ctrlAltShift {
+								return Event{CtrlAltShiftHome, 0, nil}
+							}
+							if ctrlAlt {
+								return Event{CtrlAltHome, 0, nil}
+							}
+							if ctrlShift {
+								return Event{CtrlShiftHome, 0, nil}
+							}
+							if altShift {
+								return Event{AltShiftHome, 0, nil}
+							}
+							if ctrl {
+								return Event{CtrlHome, 0, nil}
+							}
+							if alt {
+								return Event{AltHome, 0, nil}
+							}
+							if shift {
+								return Event{ShiftHome, 0, nil}
+							}
+						case 'F':
+							if ctrlAltShift {
+								return Event{CtrlAltShiftEnd, 0, nil}
+							}
+							if ctrlAlt {
+								return Event{CtrlAltEnd, 0, nil}
+							}
+							if ctrlShift {
+								return Event{CtrlShiftEnd, 0, nil}
+							}
+							if altShift {
+								return Event{AltShiftEnd, 0, nil}
+							}
+							if ctrl {
+								return Event{CtrlEnd, 0, nil}
+							}
+							if alt {
+								return Event{AltEnd, 0, nil}
+							}
+							if shift {
+								return Event{ShiftEnd, 0, nil}
+							}
+						}
 					} // r.buffer[4]
 				} // r.buffer[3]
 			} // r.buffer[2]

src/tui/light_test.go

@@ -0,0 +1,335 @@
+package tui
+
+import (
+	"fmt"
+	"os"
+	"testing"
+	"unicode"
+)
+
+func TestLightRenderer(t *testing.T) {
+	tty_file, _ := os.Open("")
+	renderer, _ := NewLightRenderer(
+		"", tty_file, &ColorTheme{}, true, false, 0, false, true,
+		func(h int) int { return h })
+
+	light_renderer := renderer.(*LightRenderer)
+
+	assertCharSequence := func(sequence string, name string) {
+		bytes := []byte(sequence)
+		light_renderer.buffer = bytes
+		event := light_renderer.GetChar()
+		if event.KeyName() != name {
+			t.Errorf(
+				"sequence: %q | %v | '%s' (%s) != %s",
+				string(bytes), bytes,
+				event.KeyName(), event.Type.String(), name)
+		}
+	}
+
+	assertEscSequence := func(sequence string, name string) {
+		bytes := []byte(sequence)
+		light_renderer.buffer = bytes
+
+		sz := 1
+		event := light_renderer.escSequence(&sz)
+		if fmt.Sprintf("!%s", event.Type.String()) == name {
+			// this is fine
+		} else if event.KeyName() != name {
+			t.Errorf(
+				"sequence: %q | %v | '%s' (%s) != %s",
+				string(bytes), bytes,
+				event.KeyName(), event.Type.String(), name)
+		}
+	}
+
+	// invalid
+	assertEscSequence("\x1b[<", "!Invalid")
+	assertEscSequence("\x1b[1;1R", "!Invalid")
+	assertEscSequence("\x1b[", "!Invalid")
+	assertEscSequence("\x1b[1", "!Invalid")
+	assertEscSequence("\x1b[3;3~1", "!Invalid")
+	assertEscSequence("\x1b[13", "!Invalid")
+	assertEscSequence("\x1b[1;3", "!Invalid")
+	assertEscSequence("\x1b[1;10", "!Invalid")
+	assertEscSequence("\x1b[220~", "!Invalid")
+	assertEscSequence("\x1b[5;30~", "!Invalid")
+	assertEscSequence("\x1b[6;30~", "!Invalid")
+
+	// general
+	for r := 'a'; r < 'z'; r++ {
+		lower_r := fmt.Sprintf("%c", r)
+		upper_r := fmt.Sprintf("%c", unicode.ToUpper(r))
+		assertCharSequence(lower_r, lower_r)
+		assertCharSequence(upper_r, upper_r)
+	}
+
+	assertCharSequence("\x01", "ctrl-a")
+	assertCharSequence("\x02", "ctrl-b")
+	assertCharSequence("\x03", "ctrl-c")
+	assertCharSequence("\x04", "ctrl-d")
+	assertCharSequence("\x05", "ctrl-e")
+	assertCharSequence("\x06", "ctrl-f")
+	assertCharSequence("\x07", "ctrl-g")
+	// ctrl-h is the same as ctrl-backspace
+	// ctrl-i is the same as tab
+	assertCharSequence("\n", "ctrl-j")
+	assertCharSequence("\x0b", "ctrl-k")
+	assertCharSequence("\x0c", "ctrl-l")
+	assertCharSequence("\r", "enter") // enter
+	assertCharSequence("\x0e", "ctrl-n")
+	assertCharSequence("\x0f", "ctrl-o")
+	assertCharSequence("\x10", "ctrl-p")
+	assertCharSequence("\x11", "ctrl-q")
+	assertCharSequence("\x12", "ctrl-r")
+	assertCharSequence("\x13", "ctrl-s")
+	assertCharSequence("\x14", "ctrl-t")
+	assertCharSequence("\x15", "ctrl-u")
+	assertCharSequence("\x16", "ctrl-v")
+	assertCharSequence("\x17", "ctrl-w")
+	assertCharSequence("\x18", "ctrl-x")
+	assertCharSequence("\x19", "ctrl-y")
+	assertCharSequence("\x1a", "ctrl-z")
+
+	assertCharSequence("\x00", "ctrl-space")
+	assertCharSequence("\x1c", "ctrl-\\")
+	assertCharSequence("\x1d", "ctrl-]")
+	assertCharSequence("\x1e", "ctrl-^")
+	assertCharSequence("\x1f", "ctrl-/")
+
+	assertEscSequence("\x1ba", "alt-a")
+	assertEscSequence("\x1bb", "alt-b")
+	assertEscSequence("\x1bc", "alt-c")
+	assertEscSequence("\x1bd", "alt-d")
+	assertEscSequence("\x1be", "alt-e")
+	assertEscSequence("\x1bf", "alt-f")
+	assertEscSequence("\x1bg", "alt-g")
+	assertEscSequence("\x1bh", "alt-h")
+	assertEscSequence("\x1bi", "alt-i")
+	assertEscSequence("\x1bj", "alt-j")
+	assertEscSequence("\x1bk", "alt-k")
+	assertEscSequence("\x1bl", "alt-l")
+	assertEscSequence("\x1bm", "alt-m")
+	assertEscSequence("\x1bn", "alt-n")
+	assertEscSequence("\x1bo", "alt-o")
+	assertEscSequence("\x1bp", "alt-p")
+	assertEscSequence("\x1bq", "alt-q")
+	assertEscSequence("\x1br", "alt-r")
+	assertEscSequence("\x1bs", "alt-s")
+	assertEscSequence("\x1bt", "alt-t")
+	assertEscSequence("\x1bu", "alt-u")
+	assertEscSequence("\x1bv", "alt-v")
+	assertEscSequence("\x1bw", "alt-w")
+	assertEscSequence("\x1bx", "alt-x")
+	assertEscSequence("\x1by", "alt-y")
+	assertEscSequence("\x1bz", "alt-z")
+
+	assertEscSequence("\x1bOP", "f1")
+	assertEscSequence("\x1bOQ", "f2")
+	assertEscSequence("\x1bOR", "f3")
+	assertEscSequence("\x1bOS", "f4")
+	assertEscSequence("\x1b[15~", "f5")
+	assertEscSequence("\x1b[17~", "f6")
+	assertEscSequence("\x1b[18~", "f7")
+	assertEscSequence("\x1b[19~", "f8")
+	assertEscSequence("\x1b[20~", "f9")
+	assertEscSequence("\x1b[21~", "f10")
+	assertEscSequence("\x1b[23~", "f11")
+	assertEscSequence("\x1b[24~", "f12")
+
+	assertEscSequence("\x1b", "esc")
+	assertCharSequence("\t", "tab")
+	assertEscSequence("\x1b[Z", "shift-tab")
+
+	assertCharSequence("\x7f", "backspace")
+	assertEscSequence("\x1b\x7f", "alt-backspace")
+	assertCharSequence("\b", "ctrl-backspace")
+	assertEscSequence("\x1b\b", "ctrl-alt-backspace")
+
+	assertEscSequence("\x1b[A", "up")
+	assertEscSequence("\x1b[B", "down")
+	assertEscSequence("\x1b[C", "right")
+	assertEscSequence("\x1b[D", "left")
+	assertEscSequence("\x1b[H", "home")
+	assertEscSequence("\x1b[F", "end")
+	assertEscSequence("\x1b[2~", "insert")
+	assertEscSequence("\x1b[3~", "delete")
+	assertEscSequence("\x1b[5~", "page-up")
+	assertEscSequence("\x1b[6~", "page-down")
+	assertEscSequence("\x1b[7~", "home")
+	assertEscSequence("\x1b[8~", "end")
+
+	assertEscSequence("\x1b[1;2A", "shift-up")
+	assertEscSequence("\x1b[1;2B", "shift-down")
+	assertEscSequence("\x1b[1;2C", "shift-right")
+	assertEscSequence("\x1b[1;2D", "shift-left")
+	assertEscSequence("\x1b[1;2H", "shift-home")
+	assertEscSequence("\x1b[1;2F", "shift-end")
+	assertEscSequence("\x1b[3;2~", "shift-delete")
+	assertEscSequence("\x1b[5;2~", "shift-page-up")
+	assertEscSequence("\x1b[6;2~", "shift-page-down")
+
+	assertEscSequence("\x1b\x1b", "esc")
+	assertEscSequence("\x1b\x1b[A", "alt-up")
+	assertEscSequence("\x1b\x1b[B", "alt-down")
+	assertEscSequence("\x1b\x1b[C", "alt-right")
+	assertEscSequence("\x1b\x1b[D", "alt-left")
+
+	assertEscSequence("\x1b[1;3A", "alt-up")
+	assertEscSequence("\x1b[1;3B", "alt-down")
+	assertEscSequence("\x1b[1;3C", "alt-right")
+	assertEscSequence("\x1b[1;3D", "alt-left")
+	assertEscSequence("\x1b[1;3H", "alt-home")
+	assertEscSequence("\x1b[1;3F", "alt-end")
+	assertEscSequence("\x1b[3;3~", "alt-delete")
+	assertEscSequence("\x1b[5;3~", "alt-page-up")
+	assertEscSequence("\x1b[6;3~", "alt-page-down")
+
+	assertEscSequence("\x1b[1;4A", "alt-shift-up")
+	assertEscSequence("\x1b[1;4B", "alt-shift-down")
+	assertEscSequence("\x1b[1;4C", "alt-shift-right")
+	assertEscSequence("\x1b[1;4D", "alt-shift-left")
+	assertEscSequence("\x1b[1;4H", "alt-shift-home")
+	assertEscSequence("\x1b[1;4F", "alt-shift-end")
+	assertEscSequence("\x1b[3;4~", "alt-shift-delete")
+	assertEscSequence("\x1b[5;4~", "alt-shift-page-up")
+	assertEscSequence("\x1b[6;4~", "alt-shift-page-down")
+
+	assertEscSequence("\x1b[1;5A", "ctrl-up")
+	assertEscSequence("\x1b[1;5B", "ctrl-down")
+	assertEscSequence("\x1b[1;5C", "ctrl-right")
+	assertEscSequence("\x1b[1;5D", "ctrl-left")
+	assertEscSequence("\x1b[1;5H", "ctrl-home")
+	assertEscSequence("\x1b[1;5F", "ctrl-end")
+	assertEscSequence("\x1b[3;5~", "ctrl-delete")
+	assertEscSequence("\x1b[5;5~", "ctrl-page-up")
+	assertEscSequence("\x1b[6;5~", "ctrl-page-down")
+
+	assertEscSequence("\x1b[1;7A", "ctrl-alt-up")
+	assertEscSequence("\x1b[1;7B", "ctrl-alt-down")
+	assertEscSequence("\x1b[1;7C", "ctrl-alt-right")
+	assertEscSequence("\x1b[1;7D", "ctrl-alt-left")
+	assertEscSequence("\x1b[1;7H", "ctrl-alt-home")
+	assertEscSequence("\x1b[1;7F", "ctrl-alt-end")
+	assertEscSequence("\x1b[3;7~", "ctrl-alt-delete")
+	assertEscSequence("\x1b[5;7~", "ctrl-alt-page-up")
+	assertEscSequence("\x1b[6;7~", "ctrl-alt-page-down")
+
+	assertEscSequence("\x1b[1;6A", "ctrl-shift-up")
+	assertEscSequence("\x1b[1;6B", "ctrl-shift-down")
+	assertEscSequence("\x1b[1;6C", "ctrl-shift-right")
+	assertEscSequence("\x1b[1;6D", "ctrl-shift-left")
+	assertEscSequence("\x1b[1;6H", "ctrl-shift-home")
+	assertEscSequence("\x1b[1;6F", "ctrl-shift-end")
+	assertEscSequence("\x1b[3;6~", "ctrl-shift-delete")
+	assertEscSequence("\x1b[5;6~", "ctrl-shift-page-up")
+	assertEscSequence("\x1b[6;6~", "ctrl-shift-page-down")
+
+	assertEscSequence("\x1b[1;8A", "ctrl-alt-shift-up")
+	assertEscSequence("\x1b[1;8B", "ctrl-alt-shift-down")
+	assertEscSequence("\x1b[1;8C", "ctrl-alt-shift-right")
+	assertEscSequence("\x1b[1;8D", "ctrl-alt-shift-left")
+	assertEscSequence("\x1b[1;8H", "ctrl-alt-shift-home")
+	assertEscSequence("\x1b[1;8F", "ctrl-alt-shift-end")
+	assertEscSequence("\x1b[3;8~", "ctrl-alt-shift-delete")
+	assertEscSequence("\x1b[5;8~", "ctrl-alt-shift-page-up")
+	assertEscSequence("\x1b[6;8~", "ctrl-alt-shift-page-down")
+
+	// xterm meta & mac
+	assertEscSequence("\x1b[1;9A", "alt-up")
+	assertEscSequence("\x1b[1;9B", "alt-down")
+	assertEscSequence("\x1b[1;9C", "alt-right")
+	assertEscSequence("\x1b[1;9D", "alt-left")
+	assertEscSequence("\x1b[1;9H", "alt-home")
+	assertEscSequence("\x1b[1;9F", "alt-end")
+	assertEscSequence("\x1b[3;9~", "alt-delete")
+	assertEscSequence("\x1b[5;9~", "alt-page-up")
+	assertEscSequence("\x1b[6;9~", "alt-page-down")
+
+	assertEscSequence("\x1b[1;10A", "alt-shift-up")
+	assertEscSequence("\x1b[1;10B", "alt-shift-down")
+	assertEscSequence("\x1b[1;10C", "alt-shift-right")
+	assertEscSequence("\x1b[1;10D", "alt-shift-left")
+	assertEscSequence("\x1b[1;10H", "alt-shift-home")
+	assertEscSequence("\x1b[1;10F", "alt-shift-end")
+	assertEscSequence("\x1b[3;10~", "alt-shift-delete")
+	assertEscSequence("\x1b[5;10~", "alt-shift-page-up")
+	assertEscSequence("\x1b[6;10~", "alt-shift-page-down")
+
+	assertEscSequence("\x1b[1;11A", "alt-up")
+	assertEscSequence("\x1b[1;11B", "alt-down")
+	assertEscSequence("\x1b[1;11C", "alt-right")
+	assertEscSequence("\x1b[1;11D", "alt-left")
+	assertEscSequence("\x1b[1;11H", "alt-home")
+	assertEscSequence("\x1b[1;11F", "alt-end")
+	assertEscSequence("\x1b[3;11~", "alt-delete")
+	assertEscSequence("\x1b[5;11~", "alt-page-up")
+	assertEscSequence("\x1b[6;11~", "alt-page-down")
+
+	assertEscSequence("\x1b[1;12A", "alt-shift-up")
+	assertEscSequence("\x1b[1;12B", "alt-shift-down")
+	assertEscSequence("\x1b[1;12C", "alt-shift-right")
+	assertEscSequence("\x1b[1;12D", "alt-shift-left")
+	assertEscSequence("\x1b[1;12H", "alt-shift-home")
+	assertEscSequence("\x1b[1;12F", "alt-shift-end")
+	assertEscSequence("\x1b[3;12~", "alt-shift-delete")
+	assertEscSequence("\x1b[5;12~", "alt-shift-page-up")
+	assertEscSequence("\x1b[6;12~", "alt-shift-page-down")
+
+	assertEscSequence("\x1b[1;13A", "ctrl-alt-up")
+	assertEscSequence("\x1b[1;13B", "ctrl-alt-down")
+	assertEscSequence("\x1b[1;13C", "ctrl-alt-right")
+	assertEscSequence("\x1b[1;13D", "ctrl-alt-left")
+	assertEscSequence("\x1b[1;13H", "ctrl-alt-home")
+	assertEscSequence("\x1b[1;13F", "ctrl-alt-end")
+	assertEscSequence("\x1b[3;13~", "ctrl-alt-delete")
+	assertEscSequence("\x1b[5;13~", "ctrl-alt-page-up")
+	assertEscSequence("\x1b[6;13~", "ctrl-alt-page-down")
+
+	assertEscSequence("\x1b[1;14A", "ctrl-alt-shift-up")
+	assertEscSequence("\x1b[1;14B", "ctrl-alt-shift-down")
+	assertEscSequence("\x1b[1;14C", "ctrl-alt-shift-right")
+	assertEscSequence("\x1b[1;14D", "ctrl-alt-shift-left")
+	assertEscSequence("\x1b[1;14H", "ctrl-alt-shift-home")
+	assertEscSequence("\x1b[1;14F", "ctrl-alt-shift-end")
+	assertEscSequence("\x1b[3;14~", "ctrl-alt-shift-delete")
+	assertEscSequence("\x1b[5;14~", "ctrl-alt-shift-page-up")
+	assertEscSequence("\x1b[6;14~", "ctrl-alt-shift-page-down")
+
+	assertEscSequence("\x1b[1;15A", "ctrl-alt-up")
+	assertEscSequence("\x1b[1;15B", "ctrl-alt-down")
+	assertEscSequence("\x1b[1;15C", "ctrl-alt-right")
+	assertEscSequence("\x1b[1;15D", "ctrl-alt-left")
+	assertEscSequence("\x1b[1;15H", "ctrl-alt-home")
+	assertEscSequence("\x1b[1;15F", "ctrl-alt-end")
+	assertEscSequence("\x1b[3;15~", "ctrl-alt-delete")
+	assertEscSequence("\x1b[5;15~", "ctrl-alt-page-up")
+	assertEscSequence("\x1b[6;15~", "ctrl-alt-page-down")
+
+	assertEscSequence("\x1b[1;16A", "ctrl-alt-shift-up")
+	assertEscSequence("\x1b[1;16B", "ctrl-alt-shift-down")
+	assertEscSequence("\x1b[1;16C", "ctrl-alt-shift-right")
+	assertEscSequence("\x1b[1;16D", "ctrl-alt-shift-left")
+	assertEscSequence("\x1b[1;16H", "ctrl-alt-shift-home")
+	assertEscSequence("\x1b[1;16F", "ctrl-alt-shift-end")
+	assertEscSequence("\x1b[3;16~", "ctrl-alt-shift-delete")
+	assertEscSequence("\x1b[5;16~", "ctrl-alt-shift-page-up")
+	assertEscSequence("\x1b[6;16~", "ctrl-alt-shift-page-down")
+
+	// tmux & emacs
+	assertEscSequence("\x1bOA", "up")
+	assertEscSequence("\x1bOB", "down")
+	assertEscSequence("\x1bOC", "right")
+	assertEscSequence("\x1bOD", "left")
+	assertEscSequence("\x1bOH", "home")
+	assertEscSequence("\x1bOF", "end")
+
+	// rrvt
+	assertEscSequence("\x1b[1~", "home")
+	assertEscSequence("\x1b[4~", "end")
+	assertEscSequence("\x1b[11~", "f1")
+	assertEscSequence("\x1b[12~", "f2")
+	assertEscSequence("\x1b[13~", "f3")
+	assertEscSequence("\x1b[14~", "f4")
+
+}

src/tui/tcell.go

@@ -36,8 +36,6 @@ func (p ColorPair) style() tcell.Style {
 	return style.Foreground(asTcellColor(p.Fg())).Background(asTcellColor(p.Bg()))
 }
 
-type Attr int32
-
 type TcellWindow struct {
 	color         bool
 	windowType    WindowType
@@ -98,14 +96,6 @@ const (
 	Italic             = Attr(tcell.AttrItalic)
 )
 
-const (
-	AttrUndefined = Attr(0)
-	AttrRegular   = Attr(1 << 7)
-	AttrClear     = Attr(1 << 8)
-	BoldForce     = Attr(1 << 10)
-	FullBg        = Attr(1 << 11)
-)
-
 func (r *FullscreenRenderer) Bell() {
 	_screen.Beep()
 }
@@ -159,15 +149,6 @@ func (c Color) Style() tcell.Color {
 	}
 }
 
-func (a Attr) Merge(b Attr) Attr {
-	if b&AttrRegular > 0 {
-		// Only keep bold attribute set by the system
-		return (b &^ AttrRegular) | (a & BoldForce)
-	}
-
-	return (a &^ AttrRegular) | b
-}
-
 // handle the following as private members of FullscreenRenderer instance
 // they are declared here to prevent introducing tcell library in non-windows builds
 var (
@@ -354,6 +335,8 @@ func (r *FullscreenRenderer) GetChar() Event {
 		shift := (mods & tcell.ModShift) > 0
 		ctrlAlt := ctrl && alt
 		altShift := alt && shift
+		ctrlShift := ctrl && shift
+		ctrlAltShift := ctrl && alt && shift
 
 		keyfn := func(r rune) Event {
 			if alt {
@@ -380,8 +363,11 @@ func (r *FullscreenRenderer) GetChar() Event {
 		case tcell.KeyCtrlH:
 			switch ev.Rune() {
 			case 0:
+				if ctrlAlt {
+					return Event{CtrlAltBackspace, 0, nil}
+				}
 				if ctrl {
-					return Event{Backspace, 0, nil}
+					return Event{CtrlBackspace, 0, nil}
 				}
 			case rune(tcell.KeyCtrlH):
 				switch {
@@ -442,6 +428,9 @@ func (r *FullscreenRenderer) GetChar() Event {
 			return Event{CtrlSlash, 0, nil}
 		// section 3: (Alt)+Backspace2
 		case tcell.KeyBackspace2:
+			if ctrl {
+				return Event{CtrlBackspace, 0, nil}
+			}
 			if alt {
 				return Event{AltBackspace, 0, nil}
 			}
@@ -449,9 +438,21 @@ func (r *FullscreenRenderer) GetChar() Event {
 
 		// section 4: (Alt+Shift)+Key(Up|Down|Left|Right)
 		case tcell.KeyUp:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftUp, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltUp, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftUp, 0, nil}
+			}
 			if altShift {
 				return Event{AltShiftUp, 0, nil}
 			}
+			if ctrl {
+				return Event{CtrlUp, 0, nil}
+			}
 			if shift {
 				return Event{ShiftUp, 0, nil}
 			}
@@ -460,9 +461,21 @@ func (r *FullscreenRenderer) GetChar() Event {
 			}
 			return Event{Up, 0, nil}
 		case tcell.KeyDown:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftDown, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltDown, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftDown, 0, nil}
+			}
 			if altShift {
 				return Event{AltShiftDown, 0, nil}
 			}
+			if ctrl {
+				return Event{CtrlDown, 0, nil}
+			}
 			if shift {
 				return Event{ShiftDown, 0, nil}
 			}
@@ -471,9 +484,21 @@ func (r *FullscreenRenderer) GetChar() Event {
 			}
 			return Event{Down, 0, nil}
 		case tcell.KeyLeft:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftLeft, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltLeft, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftLeft, 0, nil}
+			}
 			if altShift {
 				return Event{AltShiftLeft, 0, nil}
 			}
+			if ctrl {
+				return Event{CtrlLeft, 0, nil}
+			}
 			if shift {
 				return Event{ShiftLeft, 0, nil}
 			}
@@ -482,9 +507,21 @@ func (r *FullscreenRenderer) GetChar() Event {
 			}
 			return Event{Left, 0, nil}
 		case tcell.KeyRight:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftRight, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltRight, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftRight, 0, nil}
+			}
 			if altShift {
 				return Event{AltShiftRight, 0, nil}
 			}
+			if ctrl {
+				return Event{CtrlRight, 0, nil}
+			}
 			if shift {
 				return Event{ShiftRight, 0, nil}
 			}
@@ -497,20 +534,119 @@ func (r *FullscreenRenderer) GetChar() Event {
 		case tcell.KeyInsert:
 			return Event{Insert, 0, nil}
 		case tcell.KeyHome:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftHome, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltHome, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftHome, 0, nil}
+			}
+			if altShift {
+				return Event{AltShiftHome, 0, nil}
+			}
+			if ctrl {
+				return Event{CtrlHome, 0, nil}
+			}
+			if shift {
+				return Event{ShiftHome, 0, nil}
+			}
+			if alt {
+				return Event{AltHome, 0, nil}
+			}
 			return Event{Home, 0, nil}
 		case tcell.KeyDelete:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftDelete, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltDelete, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftDelete, 0, nil}
+			}
+			if altShift {
+				return Event{AltShiftDelete, 0, nil}
+			}
 			if ctrl {
 				return Event{CtrlDelete, 0, nil}
 			}
+			if alt {
+				return Event{AltDelete, 0, nil}
+			}
 			if shift {
 				return Event{ShiftDelete, 0, nil}
 			}
 			return Event{Delete, 0, nil}
 		case tcell.KeyEnd:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftEnd, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltEnd, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftEnd, 0, nil}
+			}
+			if altShift {
+				return Event{AltShiftEnd, 0, nil}
+			}
+			if ctrl {
+				return Event{CtrlEnd, 0, nil}
+			}
+			if shift {
+				return Event{ShiftEnd, 0, nil}
+			}
+			if alt {
+				return Event{AltEnd, 0, nil}
+			}
 			return Event{End, 0, nil}
 		case tcell.KeyPgUp:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftPageUp, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltPageUp, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftPageUp, 0, nil}
+			}
+			if altShift {
+				return Event{AltShiftPageUp, 0, nil}
+			}
+			if ctrl {
+				return Event{CtrlPageUp, 0, nil}
+			}
+			if shift {
+				return Event{ShiftPageUp, 0, nil}
+			}
+			if alt {
+				return Event{AltPageUp, 0, nil}
+			}
 			return Event{PageUp, 0, nil}
 		case tcell.KeyPgDn:
+			if ctrlAltShift {
+				return Event{CtrlAltShiftPageDown, 0, nil}
+			}
+			if ctrlAlt {
+				return Event{CtrlAltPageDown, 0, nil}
+			}
+			if ctrlShift {
+				return Event{CtrlShiftPageDown, 0, nil}
+			}
+			if altShift {
+				return Event{AltShiftPageDown, 0, nil}
+			}
+			if ctrl {
+				return Event{CtrlPageDown, 0, nil}
+			}
+			if shift {
+				return Event{ShiftPageDown, 0, nil}
+			}
+			if alt {
+				return Event{AltPageDown, 0, nil}
+			}
 			return Event{PageDown, 0, nil}
 		case tcell.KeyBacktab:
 			return Event{ShiftTab, 0, nil}
@@ -569,13 +705,13 @@ func (r *FullscreenRenderer) GetChar() Event {
 
 func (r *FullscreenRenderer) Pause(clear bool) {
 	if clear {
-		r.Close()
+		_screen.Suspend()
 	}
 }
 
 func (r *FullscreenRenderer) Resume(clear bool, sigcont bool) {
 	if clear {
-		r.initScreen()
+		_screen.Resume()
 	}
 }
 

src/tui/tcell_test.go

@@ -107,18 +107,20 @@ func TestGetCharEventKey(t *testing.T) {
 		{giveKey{tcell.KeyBackspace2, 0, tcell.ModAlt}, wantKey{AltBackspace, 0, nil}}, // fabricated
 		{giveKey{tcell.KeyDEL, 0, tcell.ModNone}, wantKey{Backspace, 0, nil}},          // fabricated, unhandled
 		{giveKey{tcell.KeyDelete, 0, tcell.ModNone}, wantKey{Delete, 0, nil}},
-		{giveKey{tcell.KeyDelete, 0, tcell.ModAlt}, wantKey{Delete, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModAlt}, wantKey{AltDelete, 0, nil}},
+		{giveKey{tcell.KeyBackspace, 0, tcell.ModCtrl}, wantKey{CtrlBackspace, 0, nil}},
+		{giveKey{tcell.KeyBackspace, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltBackspace, 0, nil}},
 		{giveKey{tcell.KeyBackspace, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                  // fabricated, unhandled
 		{giveKey{tcell.KeyBS, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                         // fabricated, unhandled
 		{giveKey{tcell.KeyCtrlH, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},                                                      // fabricated, unhandled
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModNone}, wantKey{Backspace, 0, nil}},                                 // actual "Backspace" keystroke
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},                               // actual "Alt+Backspace" keystroke
-		{giveKey{tcell.KeyDEL, rune(tcell.KeyDEL), tcell.ModCtrl}, wantKey{Backspace, 0, nil}},                                     // actual "Ctrl+Backspace" keystroke
+		{giveKey{tcell.KeyDEL, rune(tcell.KeyDEL), tcell.ModCtrl}, wantKey{CtrlBackspace, 0, nil}},                                 // actual "Ctrl+Backspace" keystroke
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift}, wantKey{Backspace, 0, nil}},                                // actual "Shift+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{Backspace, 0, nil}},                                     // actual "Ctrl+Alt+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltBackspace, 0, nil}},                              // actual "Ctrl+Alt+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{Backspace, 0, nil}},                                   // actual "Ctrl+Shift+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlBackspace, 0, nil}},                               // actual "Ctrl+Shift+Backspace" keystroke
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModShift | tcell.ModAlt}, wantKey{AltBackspace, 0, nil}},              // actual "Shift+Alt+Backspace" keystroke
-		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{Backspace, 0, nil}},                    // actual "Ctrl+Shift+Alt+Backspace" keystroke
+		{giveKey{tcell.KeyCtrlH, 0, tcell.ModCtrl | tcell.ModAlt | tcell.ModShift}, wantKey{CtrlAltBackspace, 0, nil}},             // actual "Ctrl+Shift+Alt+Backspace" keystroke
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl}, wantKey{CtrlH, 0, nil}},                                     // actual "Ctrl+H" keystroke
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAlt, 'h', nil}},                  // fabricated "Ctrl+Alt+H" keystroke
 		{giveKey{tcell.KeyCtrlH, rune(tcell.KeyCtrlH), tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlH, 0, nil}},                    // actual "Ctrl+Shift+H" keystroke
@@ -126,9 +128,41 @@ func TestGetCharEventKey(t *testing.T) {
 
 		// section 4: (Alt+Shift)+Key(Up|Down|Left|Right)
 		{giveKey{tcell.KeyUp, 0, tcell.ModNone}, wantKey{Up, 0, nil}},
-		{giveKey{tcell.KeyDown, 0, tcell.ModAlt}, wantKey{AltDown, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModNone}, wantKey{Down, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModNone}, wantKey{Left, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModNone}, wantKey{Right, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModNone}, wantKey{Up, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModNone}, wantKey{Down, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModNone}, wantKey{Right, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModNone}, wantKey{Left, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModCtrl}, wantKey{CtrlUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModCtrl}, wantKey{CtrlDown, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModCtrl}, wantKey{CtrlRight, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModCtrl}, wantKey{CtrlLeft, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModShift}, wantKey{ShiftUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModShift}, wantKey{ShiftDown, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModShift}, wantKey{ShiftRight, 0, nil}},
 		{giveKey{tcell.KeyLeft, 0, tcell.ModShift}, wantKey{ShiftLeft, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModAlt}, wantKey{AltUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModAlt}, wantKey{AltDown, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModAlt}, wantKey{AltRight, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModAlt}, wantKey{AltLeft, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftDown, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftRight, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftLeft, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltDown, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltRight, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltLeft, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftDown, 0, nil}},
 		{giveKey{tcell.KeyRight, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftRight, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftLeft, 0, nil}},
+		{giveKey{tcell.KeyUp, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftUp, 0, nil}},
+		{giveKey{tcell.KeyDown, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftDown, 0, nil}},
+		{giveKey{tcell.KeyRight, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftRight, 0, nil}},
+		{giveKey{tcell.KeyLeft, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftLeft, 0, nil}},
 		{giveKey{tcell.KeyUpLeft, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},    // fabricated, unhandled
 		{giveKey{tcell.KeyUpRight, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},   // fabricated, unhandled
 		{giveKey{tcell.KeyDownLeft, 0, tcell.ModNone}, wantKey{Invalid, 0, nil}},  // fabricated, unhandled
@@ -137,6 +171,46 @@ func TestGetCharEventKey(t *testing.T) {
 		// section 5: (Insert|Home|Delete|End|PgUp|PgDn|BackTab|F1-F12)
 		{giveKey{tcell.KeyInsert, 0, tcell.ModNone}, wantKey{Insert, 0, nil}},
 		{giveKey{tcell.KeyF1, 0, tcell.ModNone}, wantKey{F1, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModNone}, wantKey{Home, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModNone}, wantKey{End, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModNone}, wantKey{Delete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModNone}, wantKey{PageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModNone}, wantKey{PageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModCtrl}, wantKey{CtrlHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModCtrl}, wantKey{CtrlEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModCtrl}, wantKey{CtrlDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModCtrl}, wantKey{CtrlPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModCtrl}, wantKey{CtrlPageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModShift}, wantKey{ShiftHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModShift}, wantKey{ShiftEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModShift}, wantKey{ShiftDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModShift}, wantKey{ShiftPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModShift}, wantKey{ShiftPageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModAlt}, wantKey{AltHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModAlt}, wantKey{AltEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModAlt}, wantKey{AltDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModAlt}, wantKey{AltPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModAlt}, wantKey{AltPageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModCtrl | tcell.ModShift}, wantKey{CtrlShiftPageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModCtrl | tcell.ModAlt}, wantKey{CtrlAltPageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModShift | tcell.ModAlt}, wantKey{AltShiftPageDown, 0, nil}},
+		{giveKey{tcell.KeyHome, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftHome, 0, nil}},
+		{giveKey{tcell.KeyEnd, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftEnd, 0, nil}},
+		{giveKey{tcell.KeyDelete, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftDelete, 0, nil}},
+		{giveKey{tcell.KeyPgUp, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftPageUp, 0, nil}},
+		{giveKey{tcell.KeyPgDn, 0, tcell.ModCtrl | tcell.ModShift | tcell.ModAlt}, wantKey{CtrlAltShiftPageDown, 0, nil}},
 		// section 6: (Ctrl+Alt)+'rune'
 		{giveKey{tcell.KeyRune, 'a', tcell.ModNone}, wantKey{Rune, 'a', nil}},
 		{giveKey{tcell.KeyRune, 'a', tcell.ModCtrl}, wantKey{Rune, 'a', nil}}, // fabricated
@@ -198,6 +272,10 @@ func TestGetCharEventKey(t *testing.T) {
 			initialResizeAsInvalid = false
 			gotEvent = r.GetChar()
 		}
+		if gotEvent.Type == Resize {
+			t.Logf("Resize swallowed")
+			gotEvent = r.GetChar()
+		}
 		t.Logf("wantEvent = %T{Type: %v, Char: %q (%[3]v)}\n", test.wantKey, test.wantKey.Type, test.wantKey.Char)
 		t.Logf("gotEvent = %T{Type: %v, Char: %q (%[3]v)}\n", gotEvent, gotEvent.Type, gotEvent.Char)
 

src/tui/tui.go

@@ -8,6 +8,26 @@ import (
 	"github.com/rivo/uniseg"
 )
 
+type Attr int32
+
+const (
+	AttrUndefined = Attr(0)
+	AttrRegular   = Attr(1 << 8)
+	AttrClear     = Attr(1 << 9)
+	BoldForce     = Attr(1 << 10)
+	FullBg        = Attr(1 << 11)
+	Strip         = Attr(1 << 12)
+)
+
+func (a Attr) Merge(b Attr) Attr {
+	if b&AttrRegular > 0 {
+		// Only keep bold attribute set by the system
+		return (b &^ AttrRegular) | (a & BoldForce)
+	}
+
+	return (a &^ AttrRegular) | b
+}
+
 // Types of user action
 //
 //go:generate stringer -type=EventType
@@ -44,7 +64,6 @@ const (
 	CtrlZ
 	Esc
 	CtrlSpace
-	CtrlDelete
 
 	// https://apple.stackexchange.com/questions/24261/how-do-i-send-c-that-is-control-slash-to-the-terminal
 	CtrlBackSlash
@@ -72,6 +91,10 @@ const (
 	ShiftLeft
 	ShiftRight
 	ShiftDelete
+	ShiftHome
+	ShiftEnd
+	ShiftPageUp
+	ShiftPageDown
 
 	F1
 	F2
@@ -92,15 +115,67 @@ const (
 	AltDown
 	AltLeft
 	AltRight
+	AltDelete
+	AltHome
+	AltEnd
+	AltPageUp
+	AltPageDown
 
 	AltShiftUp
 	AltShiftDown
 	AltShiftLeft
 	AltShiftRight
+	AltShiftDelete
+	AltShiftHome
+	AltShiftEnd
+	AltShiftPageUp
+	AltShiftPageDown
+
+	CtrlUp
+	CtrlDown
+	CtrlLeft
+	CtrlRight
+	CtrlHome
+	CtrlEnd
+	CtrlBackspace
+	CtrlDelete
+	CtrlPageUp
+	CtrlPageDown
 
 	Alt
 	CtrlAlt
 
+	CtrlAltUp
+	CtrlAltDown
+	CtrlAltLeft
+	CtrlAltRight
+	CtrlAltHome
+	CtrlAltEnd
+	CtrlAltBackspace
+	CtrlAltDelete
+	CtrlAltPageUp
+	CtrlAltPageDown
+
+	CtrlShiftUp
+	CtrlShiftDown
+	CtrlShiftLeft
+	CtrlShiftRight
+	CtrlShiftHome
+	CtrlShiftEnd
+	CtrlShiftDelete
+	CtrlShiftPageUp
+	CtrlShiftPageDown
+
+	CtrlAltShiftUp
+	CtrlAltShiftDown
+	CtrlAltShiftLeft
+	CtrlAltShiftRight
+	CtrlAltShiftHome
+	CtrlAltShiftEnd
+	CtrlAltShiftDelete
+	CtrlAltShiftPageUp
+	CtrlAltShiftPageDown
+
 	Invalid
 	Fatal
 	BracketedPasteBegin
@@ -220,6 +295,13 @@ func (a ColorAttr) IsColorDefined() bool {
 	return a.Color != colUndefined
 }
 
+func (a ColorAttr) IsAttrDefined() bool {
+	return a.Attr != AttrUndefined
+}
+func (a ColorAttr) IsUndefined() bool {
+	return !a.IsColorDefined() && !a.IsAttrDefined()
+}
+
 func NewColorAttr() ColorAttr {
 	return ColorAttr{Color: colUndefined, Attr: AttrUndefined}
 }
@@ -248,6 +330,14 @@ const (
 	colMagenta
 	colCyan
 	colWhite
+	colGrey
+	colBrightRed
+	colBrightGreen
+	colBrightYellow
+	colBrightBlue
+	colBrightMagenta
+	colBrightCyan
+	colBrightWhite
 )
 
 type FillReturn int
@@ -295,6 +385,10 @@ func (p ColorPair) IsFullBgMarker() bool {
 	return p.attr&FullBg > 0
 }
 
+func (p ColorPair) ShouldStripColors() bool {
+	return p.attr&Strip > 0
+}
+
 func (p ColorPair) HasBg() bool {
 	return p.attr&Reverse == 0 && p.bg != colDefault ||
 		p.attr&Reverse > 0 && p.fg != colDefault
@@ -318,6 +412,12 @@ func (p ColorPair) WithAttr(attr Attr) ColorPair {
 	return dup
 }
 
+func (p ColorPair) WithFg(fg ColorAttr) ColorPair {
+	dup := p
+	fgPair := ColorPair{fg.Color, colUndefined, fg.Attr}
+	return dup.Merge(fgPair)
+}
+
 func (p ColorPair) WithBg(bg ColorAttr) ColorPair {
 	dup := p
 	bgPair := ColorPair{colUndefined, bg.Color, bg.Attr}
@@ -347,6 +447,7 @@ type ColorTheme struct {
 	ListBg           ColorAttr
 	AltBg            ColorAttr
 	Nth              ColorAttr
+	Nomatch          ColorAttr
 	SelectedFg       ColorAttr
 	SelectedBg       ColorAttr
 	SelectedMatch    ColorAttr
@@ -709,6 +810,8 @@ func NewFullscreenRenderer(theme *ColorTheme, forceBlack bool, mouse bool) Rende
 }
 
 var (
+	NoColorTheme *ColorTheme
+	EmptyTheme   *ColorTheme
 	Default16    *ColorTheme
 	Dark256      *ColorTheme
 	Light256     *ColorTheme
@@ -721,6 +824,7 @@ var (
 	ColMatch                ColorPair
 	ColCursor               ColorPair
 	ColCursorEmpty          ColorPair
+	ColCursorEmptyChar      ColorPair
 	ColMarker               ColorPair
 	ColSelected             ColorPair
 	ColSelectedMatch        ColorPair
@@ -754,167 +858,170 @@ var (
 	ColInputLabel           ColorPair
 )
 
-func EmptyTheme() *ColorTheme {
-	return &ColorTheme{
-		Colored:          true,
-		Input:            ColorAttr{colUndefined, AttrUndefined},
-		Fg:               ColorAttr{colUndefined, AttrUndefined},
-		Bg:               ColorAttr{colUndefined, AttrUndefined},
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
-		AltBg:            ColorAttr{colUndefined, AttrUndefined},
-		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
-		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
-		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
-		DarkBg:           ColorAttr{colUndefined, AttrUndefined},
-		Prompt:           ColorAttr{colUndefined, AttrUndefined},
-		Match:            ColorAttr{colUndefined, AttrUndefined},
-		Current:          ColorAttr{colUndefined, AttrUndefined},
-		CurrentMatch:     ColorAttr{colUndefined, AttrUndefined},
-		Spinner:          ColorAttr{colUndefined, AttrUndefined},
-		Info:             ColorAttr{colUndefined, AttrUndefined},
-		Cursor:           ColorAttr{colUndefined, AttrUndefined},
-		Marker:           ColorAttr{colUndefined, AttrUndefined},
-		Header:           ColorAttr{colUndefined, AttrUndefined},
-		Footer:           ColorAttr{colUndefined, AttrUndefined},
-		Border:           ColorAttr{colUndefined, AttrUndefined},
-		BorderLabel:      ColorAttr{colUndefined, AttrUndefined},
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
-		Ghost:            ColorAttr{colUndefined, Dim},
-		Disabled:         ColorAttr{colUndefined, AttrUndefined},
-		PreviewFg:        ColorAttr{colUndefined, AttrUndefined},
-		PreviewBg:        ColorAttr{colUndefined, AttrUndefined},
-		Gutter:           ColorAttr{colUndefined, AttrUndefined},
-		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
-		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
-		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
-		Separator:        ColorAttr{colUndefined, AttrUndefined},
-		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
-		HeaderBg:         ColorAttr{colUndefined, AttrUndefined},
-		HeaderBorder:     ColorAttr{colUndefined, AttrUndefined},
-		HeaderLabel:      ColorAttr{colUndefined, AttrUndefined},
-		FooterBg:         ColorAttr{colUndefined, AttrUndefined},
-		FooterBorder:     ColorAttr{colUndefined, AttrUndefined},
-		FooterLabel:      ColorAttr{colUndefined, AttrUndefined},
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
-	}
-}
-
-func NoColorTheme() *ColorTheme {
-	return &ColorTheme{
-		Colored:          false,
-		Input:            ColorAttr{colDefault, AttrUndefined},
-		Fg:               ColorAttr{colDefault, AttrUndefined},
-		Bg:               ColorAttr{colDefault, AttrUndefined},
-		ListFg:           ColorAttr{colDefault, AttrUndefined},
-		ListBg:           ColorAttr{colDefault, AttrUndefined},
-		AltBg:            ColorAttr{colUndefined, AttrUndefined},
-		SelectedFg:       ColorAttr{colDefault, AttrUndefined},
-		SelectedBg:       ColorAttr{colDefault, AttrUndefined},
-		SelectedMatch:    ColorAttr{colDefault, AttrUndefined},
-		DarkBg:           ColorAttr{colDefault, AttrUndefined},
-		Prompt:           ColorAttr{colDefault, AttrUndefined},
-		Match:            ColorAttr{colDefault, Underline},
-		Current:          ColorAttr{colDefault, Reverse},
-		CurrentMatch:     ColorAttr{colDefault, Reverse | Underline},
-		Spinner:          ColorAttr{colDefault, AttrUndefined},
-		Info:             ColorAttr{colDefault, AttrUndefined},
-		Cursor:           ColorAttr{colDefault, AttrUndefined},
-		Marker:           ColorAttr{colDefault, AttrUndefined},
-		Header:           ColorAttr{colDefault, AttrUndefined},
-		Border:           ColorAttr{colDefault, AttrUndefined},
-		BorderLabel:      ColorAttr{colDefault, AttrUndefined},
-		Ghost:            ColorAttr{colDefault, Dim},
-		Disabled:         ColorAttr{colDefault, AttrUndefined},
-		PreviewFg:        ColorAttr{colDefault, AttrUndefined},
-		PreviewBg:        ColorAttr{colDefault, AttrUndefined},
-		Gutter:           ColorAttr{colDefault, AttrUndefined},
-		PreviewBorder:    ColorAttr{colDefault, AttrUndefined},
-		PreviewScrollbar: ColorAttr{colDefault, AttrUndefined},
-		PreviewLabel:     ColorAttr{colDefault, AttrUndefined},
-		ListLabel:        ColorAttr{colDefault, AttrUndefined},
-		ListBorder:       ColorAttr{colDefault, AttrUndefined},
-		Separator:        ColorAttr{colDefault, AttrUndefined},
-		Scrollbar:        ColorAttr{colDefault, AttrUndefined},
-		InputBg:          ColorAttr{colDefault, AttrUndefined},
-		InputBorder:      ColorAttr{colDefault, AttrUndefined},
-		InputLabel:       ColorAttr{colDefault, AttrUndefined},
-		HeaderBg:         ColorAttr{colDefault, AttrUndefined},
-		HeaderBorder:     ColorAttr{colDefault, AttrUndefined},
-		HeaderLabel:      ColorAttr{colDefault, AttrUndefined},
-		FooterBg:         ColorAttr{colDefault, AttrUndefined},
-		FooterBorder:     ColorAttr{colDefault, AttrUndefined},
-		FooterLabel:      ColorAttr{colDefault, AttrUndefined},
-		GapLine:          ColorAttr{colDefault, AttrUndefined},
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
-	}
-}
-
 func init() {
+	defaultColor := ColorAttr{colDefault, AttrUndefined}
+	undefined := ColorAttr{colUndefined, AttrUndefined}
+
+	NoColorTheme = &ColorTheme{
+		Colored:          false,
+		Input:            defaultColor,
+		Fg:               defaultColor,
+		Bg:               defaultColor,
+		ListFg:           defaultColor,
+		ListBg:           defaultColor,
+		AltBg:            undefined,
+		SelectedFg:       defaultColor,
+		SelectedBg:       defaultColor,
+		SelectedMatch:    defaultColor,
+		DarkBg:           defaultColor,
+		Prompt:           defaultColor,
+		Match:            defaultColor,
+		Current:          undefined,
+		CurrentMatch:     undefined,
+		Spinner:          defaultColor,
+		Info:             defaultColor,
+		Cursor:           defaultColor,
+		Marker:           defaultColor,
+		Header:           defaultColor,
+		Border:           undefined,
+		BorderLabel:      defaultColor,
+		Ghost:            undefined,
+		Disabled:         defaultColor,
+		PreviewFg:        defaultColor,
+		PreviewBg:        defaultColor,
+		Gutter:           undefined,
+		PreviewBorder:    defaultColor,
+		PreviewScrollbar: defaultColor,
+		PreviewLabel:     defaultColor,
+		ListLabel:        defaultColor,
+		ListBorder:       defaultColor,
+		Separator:        defaultColor,
+		Scrollbar:        defaultColor,
+		InputBg:          defaultColor,
+		InputBorder:      defaultColor,
+		InputLabel:       defaultColor,
+		HeaderBg:         defaultColor,
+		HeaderBorder:     defaultColor,
+		HeaderLabel:      defaultColor,
+		FooterBg:         defaultColor,
+		FooterBorder:     defaultColor,
+		FooterLabel:      defaultColor,
+		GapLine:          defaultColor,
+		Nth:              undefined,
+		Nomatch:          undefined,
+	}
+
+	EmptyTheme = &ColorTheme{
+		Colored:          true,
+		Input:            undefined,
+		Fg:               undefined,
+		Bg:               undefined,
+		ListFg:           undefined,
+		ListBg:           undefined,
+		AltBg:            undefined,
+		SelectedFg:       undefined,
+		SelectedBg:       undefined,
+		SelectedMatch:    undefined,
+		DarkBg:           undefined,
+		Prompt:           undefined,
+		Match:            undefined,
+		Current:          undefined,
+		CurrentMatch:     undefined,
+		Spinner:          undefined,
+		Info:             undefined,
+		Cursor:           undefined,
+		Marker:           undefined,
+		Header:           undefined,
+		Footer:           undefined,
+		Border:           undefined,
+		BorderLabel:      undefined,
+		ListLabel:        undefined,
+		ListBorder:       undefined,
+		Ghost:            undefined,
+		Disabled:         undefined,
+		PreviewFg:        undefined,
+		PreviewBg:        undefined,
+		Gutter:           undefined,
+		PreviewBorder:    undefined,
+		PreviewScrollbar: undefined,
+		PreviewLabel:     undefined,
+		Separator:        undefined,
+		Scrollbar:        undefined,
+		InputBg:          undefined,
+		InputBorder:      undefined,
+		InputLabel:       undefined,
+		HeaderBg:         undefined,
+		HeaderBorder:     undefined,
+		HeaderLabel:      undefined,
+		FooterBg:         undefined,
+		FooterBorder:     undefined,
+		FooterLabel:      undefined,
+		GapLine:          undefined,
+		Nth:              undefined,
+		Nomatch:          undefined,
+	}
+
 	Default16 = &ColorTheme{
 		Colored:          true,
-		Input:            ColorAttr{colDefault, AttrUndefined},
+		Input:            defaultColor,
-		Fg:               ColorAttr{colDefault, AttrUndefined},
+		Fg:               defaultColor,
-		Bg:               ColorAttr{colDefault, AttrUndefined},
+		Bg:               defaultColor,
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
+		ListFg:           undefined,
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
+		ListBg:           undefined,
-		AltBg:            ColorAttr{colUndefined, AttrUndefined},
+		AltBg:            undefined,
-		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
+		SelectedFg:       undefined,
-		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
+		SelectedBg:       undefined,
-		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
+		SelectedMatch:    undefined,
-		DarkBg:           ColorAttr{colBlack, AttrUndefined},
+		DarkBg:           ColorAttr{colGrey, AttrUndefined},
 		Prompt:           ColorAttr{colBlue, AttrUndefined},
 		Match:            ColorAttr{colGreen, AttrUndefined},
-		Current:          ColorAttr{colYellow, AttrUndefined},
+		Current:          ColorAttr{colBrightWhite, AttrUndefined},
-		CurrentMatch:     ColorAttr{colGreen, AttrUndefined},
+		CurrentMatch:     ColorAttr{colBrightGreen, AttrUndefined},
 		Spinner:          ColorAttr{colGreen, AttrUndefined},
-		Info:             ColorAttr{colWhite, AttrUndefined},
+		Info:             ColorAttr{colYellow, AttrUndefined},
 		Cursor:           ColorAttr{colRed, AttrUndefined},
 		Marker:           ColorAttr{colMagenta, AttrUndefined},
 		Header:           ColorAttr{colCyan, AttrUndefined},
 		Footer:           ColorAttr{colCyan, AttrUndefined},
-		Border:           ColorAttr{colBlack, AttrUndefined},
+		Border:           undefined,
-		BorderLabel:      ColorAttr{colWhite, AttrUndefined},
+		BorderLabel:      defaultColor,
-		Ghost:            ColorAttr{colUndefined, Dim},
+		Ghost:            undefined,
-		Disabled:         ColorAttr{colUndefined, AttrUndefined},
+		Disabled:         undefined,
-		PreviewFg:        ColorAttr{colUndefined, AttrUndefined},
+		PreviewFg:        undefined,
-		PreviewBg:        ColorAttr{colUndefined, AttrUndefined},
+		PreviewBg:        undefined,
-		Gutter:           ColorAttr{colUndefined, AttrUndefined},
+		Gutter:           undefined,
-		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
+		PreviewBorder:    undefined,
-		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
+		PreviewScrollbar: undefined,
-		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
+		PreviewLabel:     undefined,
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
+		ListLabel:        undefined,
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
+		ListBorder:       undefined,
-		Separator:        ColorAttr{colUndefined, AttrUndefined},
+		Separator:        undefined,
-		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
+		Scrollbar:        undefined,
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
+		InputBg:          undefined,
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
+		InputBorder:      undefined,
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
+		InputLabel:       undefined,
-		HeaderBg:         ColorAttr{colUndefined, AttrUndefined},
+		HeaderBg:         undefined,
-		HeaderBorder:     ColorAttr{colUndefined, AttrUndefined},
+		HeaderBorder:     undefined,
-		HeaderLabel:      ColorAttr{colUndefined, AttrUndefined},
+		HeaderLabel:      undefined,
-		FooterBg:         ColorAttr{colUndefined, AttrUndefined},
+		FooterBg:         undefined,
-		FooterBorder:     ColorAttr{colUndefined, AttrUndefined},
+		FooterBorder:     undefined,
-		FooterLabel:      ColorAttr{colUndefined, AttrUndefined},
+		FooterLabel:      undefined,
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
+		GapLine:          undefined,
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
+		Nth:              undefined,
+		Nomatch:          undefined,
 	}
+
 	Dark256 = &ColorTheme{
 		Colored:          true,
-		Input:            ColorAttr{colDefault, AttrUndefined},
+		Input:            defaultColor,
-		Fg:               ColorAttr{colDefault, AttrUndefined},
+		Fg:               defaultColor,
-		Bg:               ColorAttr{colDefault, AttrUndefined},
+		Bg:               defaultColor,
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
+		ListFg:           undefined,
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
+		ListBg:           undefined,
-		AltBg:            ColorAttr{colUndefined, AttrUndefined},
+		AltBg:            undefined,
-		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
+		SelectedFg:       undefined,
-		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
+		SelectedBg:       undefined,
-		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
+		SelectedMatch:    undefined,
 		DarkBg:           ColorAttr{236, AttrUndefined},
 		Prompt:           ColorAttr{110, AttrUndefined},
 		Match:            ColorAttr{108, AttrUndefined},
@@ -928,41 +1035,43 @@ func init() {
 		Footer:           ColorAttr{109, AttrUndefined},
 		Border:           ColorAttr{59, AttrUndefined},
 		BorderLabel:      ColorAttr{145, AttrUndefined},
-		Ghost:            ColorAttr{colUndefined, Dim},
+		Ghost:            undefined,
-		Disabled:         ColorAttr{colUndefined, AttrUndefined},
+		Disabled:         undefined,
-		PreviewFg:        ColorAttr{colUndefined, AttrUndefined},
+		PreviewFg:        undefined,
-		PreviewBg:        ColorAttr{colUndefined, AttrUndefined},
+		PreviewBg:        undefined,
-		Gutter:           ColorAttr{colUndefined, AttrUndefined},
+		Gutter:           undefined,
-		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
+		PreviewBorder:    undefined,
-		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
+		PreviewScrollbar: undefined,
-		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
+		PreviewLabel:     undefined,
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
+		ListLabel:        undefined,
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
+		ListBorder:       undefined,
-		Separator:        ColorAttr{colUndefined, AttrUndefined},
+		Separator:        undefined,
-		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
+		Scrollbar:        undefined,
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
+		InputBg:          undefined,
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
+		InputBorder:      undefined,
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
+		InputLabel:       undefined,
-		HeaderBg:         ColorAttr{colUndefined, AttrUndefined},
+		HeaderBg:         undefined,
-		HeaderBorder:     ColorAttr{colUndefined, AttrUndefined},
+		HeaderBorder:     undefined,
-		HeaderLabel:      ColorAttr{colUndefined, AttrUndefined},
+		HeaderLabel:      undefined,
-		FooterBg:         ColorAttr{colUndefined, AttrUndefined},
+		FooterBg:         undefined,
-		FooterBorder:     ColorAttr{colUndefined, AttrUndefined},
+		FooterBorder:     undefined,
-		FooterLabel:      ColorAttr{colUndefined, AttrUndefined},
+		FooterLabel:      undefined,
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
+		GapLine:          undefined,
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
+		Nth:              undefined,
+		Nomatch:          undefined,
 	}
+
 	Light256 = &ColorTheme{
 		Colored:          true,
-		Input:            ColorAttr{colDefault, AttrUndefined},
+		Input:            defaultColor,
-		Fg:               ColorAttr{colDefault, AttrUndefined},
+		Fg:               defaultColor,
-		Bg:               ColorAttr{colDefault, AttrUndefined},
+		Bg:               defaultColor,
-		ListFg:           ColorAttr{colUndefined, AttrUndefined},
+		ListFg:           undefined,
-		ListBg:           ColorAttr{colUndefined, AttrUndefined},
+		ListBg:           undefined,
-		AltBg:            ColorAttr{colUndefined, AttrUndefined},
+		AltBg:            undefined,
-		SelectedFg:       ColorAttr{colUndefined, AttrUndefined},
+		SelectedFg:       undefined,
-		SelectedBg:       ColorAttr{colUndefined, AttrUndefined},
+		SelectedBg:       undefined,
-		SelectedMatch:    ColorAttr{colUndefined, AttrUndefined},
+		SelectedMatch:    undefined,
 		DarkBg:           ColorAttr{251, AttrUndefined},
 		Prompt:           ColorAttr{25, AttrUndefined},
 		Match:            ColorAttr{66, AttrUndefined},
@@ -976,37 +1085,54 @@ func init() {
 		Footer:           ColorAttr{31, AttrUndefined},
 		Border:           ColorAttr{145, AttrUndefined},
 		BorderLabel:      ColorAttr{59, AttrUndefined},
-		Ghost:            ColorAttr{colUndefined, Dim},
+		Ghost:            undefined,
-		Disabled:         ColorAttr{colUndefined, AttrUndefined},
+		Disabled:         undefined,
-		PreviewFg:        ColorAttr{colUndefined, AttrUndefined},
+		PreviewFg:        undefined,
-		PreviewBg:        ColorAttr{colUndefined, AttrUndefined},
+		PreviewBg:        undefined,
-		Gutter:           ColorAttr{colUndefined, AttrUndefined},
+		Gutter:           undefined,
-		PreviewBorder:    ColorAttr{colUndefined, AttrUndefined},
+		PreviewBorder:    undefined,
-		PreviewScrollbar: ColorAttr{colUndefined, AttrUndefined},
+		PreviewScrollbar: undefined,
-		PreviewLabel:     ColorAttr{colUndefined, AttrUndefined},
+		PreviewLabel:     undefined,
-		ListLabel:        ColorAttr{colUndefined, AttrUndefined},
+		ListLabel:        undefined,
-		ListBorder:       ColorAttr{colUndefined, AttrUndefined},
+		ListBorder:       undefined,
-		Separator:        ColorAttr{colUndefined, AttrUndefined},
+		Separator:        undefined,
-		Scrollbar:        ColorAttr{colUndefined, AttrUndefined},
+		Scrollbar:        undefined,
-		InputBg:          ColorAttr{colUndefined, AttrUndefined},
+		InputBg:          undefined,
-		InputBorder:      ColorAttr{colUndefined, AttrUndefined},
+		InputBorder:      undefined,
-		InputLabel:       ColorAttr{colUndefined, AttrUndefined},
+		InputLabel:       undefined,
-		HeaderBg:         ColorAttr{colUndefined, AttrUndefined},
+		HeaderBg:         undefined,
-		HeaderBorder:     ColorAttr{colUndefined, AttrUndefined},
+		HeaderBorder:     undefined,
-		HeaderLabel:      ColorAttr{colUndefined, AttrUndefined},
+		HeaderLabel:      undefined,
-		FooterBg:         ColorAttr{colUndefined, AttrUndefined},
+		FooterBg:         undefined,
-		FooterBorder:     ColorAttr{colUndefined, AttrUndefined},
+		FooterBorder:     undefined,
-		FooterLabel:      ColorAttr{colUndefined, AttrUndefined},
+		FooterLabel:      undefined,
-		GapLine:          ColorAttr{colUndefined, AttrUndefined},
+		GapLine:          undefined,
-		Nth:              ColorAttr{colUndefined, AttrUndefined},
+		Nth:              undefined,
+		Nomatch:          undefined,
 	}
 }
 
-func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInputWindow bool, hasHeaderWindow bool) {
+func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, boldify bool, forceBlack bool, hasInputWindow bool, hasHeaderWindow bool) {
 	if forceBlack {
 		theme.Bg = ColorAttr{colBlack, AttrUndefined}
 	}
 
+	if boldify {
+		boldify := func(c ColorAttr) ColorAttr {
+			dup := c
+			if (c.Attr & AttrRegular) == 0 {
+				dup.Attr |= BoldForce
+			}
+			return dup
+		}
+		theme.Current = boldify(theme.Current)
+		theme.CurrentMatch = boldify(theme.CurrentMatch)
+		theme.Prompt = boldify(theme.Prompt)
+		theme.Input = boldify(theme.Input)
+		theme.Cursor = boldify(theme.Cursor)
+		theme.Spinner = boldify(theme.Spinner)
+	}
+
 	o := func(a ColorAttr, b ColorAttr) ColorAttr {
 		c := a
 		if b.Color != colUndefined {
@@ -1022,18 +1148,36 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInp
 	theme.Bg = o(baseTheme.Bg, theme.Bg)
 	theme.DarkBg = o(baseTheme.DarkBg, theme.DarkBg)
 	theme.Prompt = o(baseTheme.Prompt, theme.Prompt)
-	theme.Match = o(baseTheme.Match, theme.Match)
+	match := theme.Match
+	if !baseTheme.Colored && match.IsUndefined() {
+		match.Attr = Underline
+	}
+	theme.Match = o(baseTheme.Match, match)
 	// Inherit from 'fg', so that we don't have to write 'current-fg:dim'
 	// e.g. fzf --delimiter / --nth -1 --color fg:dim,nth:regular
-	theme.Current = theme.Fg.Merge(o(baseTheme.Current, theme.Current))
+	current := theme.Current
-	theme.CurrentMatch = o(baseTheme.CurrentMatch, theme.CurrentMatch)
+	if !baseTheme.Colored && current.IsUndefined() {
+		current.Attr = Reverse
+	}
+	theme.Current = theme.Fg.Merge(o(baseTheme.Current, current))
+	currentMatch := theme.CurrentMatch
+	if !baseTheme.Colored && currentMatch.IsUndefined() {
+		currentMatch.Attr = Reverse | Underline
+	}
+	theme.CurrentMatch = o(baseTheme.CurrentMatch, currentMatch)
 	theme.Spinner = o(baseTheme.Spinner, theme.Spinner)
 	theme.Info = o(baseTheme.Info, theme.Info)
 	theme.Cursor = o(baseTheme.Cursor, theme.Cursor)
 	theme.Marker = o(baseTheme.Marker, theme.Marker)
 	theme.Header = o(baseTheme.Header, theme.Header)
 	theme.Footer = o(baseTheme.Footer, theme.Footer)
-	theme.Border = o(baseTheme.Border, theme.Border)
+
+	// If border color is undefined, set it to default color with dim attribute.
+	border := theme.Border
+	if baseTheme.Border.IsUndefined() && border.IsUndefined() {
+		border.Attr = Dim
+	}
+	theme.Border = o(baseTheme.Border, border)
 	theme.BorderLabel = o(baseTheme.BorderLabel, theme.BorderLabel)
 
 	undefined := NewColorAttr()
@@ -1046,9 +1190,23 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInp
 	theme.SelectedFg = o(theme.ListFg, theme.SelectedFg)
 	theme.SelectedBg = o(theme.ListBg, theme.SelectedBg)
 	theme.SelectedMatch = o(theme.Match, theme.SelectedMatch)
-	theme.Ghost = o(theme.Input, theme.Ghost)
+
+	ghost := theme.Ghost
+	if ghost.IsUndefined() {
+		ghost.Attr = Dim
+	} else if ghost.IsColorDefined() && !ghost.IsAttrDefined() {
+		// Don't want to inherit 'bold' from 'input'
+		ghost.Attr = AttrRegular
+	}
+	theme.Ghost = o(theme.Input, ghost)
 	theme.Disabled = o(theme.Input, theme.Disabled)
-	theme.Gutter = o(theme.DarkBg, theme.Gutter)
+
+	// Use dim gutter on non-colored themes if undefined
+	gutter := theme.Gutter
+	if !baseTheme.Colored && gutter.IsUndefined() {
+		gutter.Attr = Dim
+	}
+	theme.Gutter = o(theme.DarkBg, gutter)
 	theme.PreviewFg = o(theme.Fg, theme.PreviewFg)
 	theme.PreviewBg = o(theme.Bg, theme.PreviewBg)
 	theme.PreviewLabel = o(theme.BorderLabel, theme.PreviewLabel)
@@ -1090,6 +1248,10 @@ func InitTheme(theme *ColorTheme, baseTheme *ColorTheme, forceBlack bool, hasInp
 	theme.FooterBorder = o(theme.Border, theme.FooterBorder)
 	theme.FooterLabel = o(theme.BorderLabel, theme.FooterLabel)
 
+	if theme.Nomatch.IsUndefined() {
+		theme.Nomatch.Attr = Dim
+	}
+
 	initPalette(theme)
 }
 
@@ -1113,10 +1275,11 @@ func initPalette(theme *ColorTheme) {
 	ColSelectedMatch = pair(theme.SelectedMatch, theme.SelectedBg)
 	ColCursor = pair(theme.Cursor, theme.Gutter)
 	ColCursorEmpty = pair(blank, theme.Gutter)
+	ColCursorEmptyChar = pair(theme.Gutter, theme.ListBg)
 	if theme.SelectedBg.Color != theme.ListBg.Color {
 		ColMarker = pair(theme.Marker, theme.SelectedBg)
 	} else {
-		ColMarker = pair(theme.Marker, theme.Gutter)
+		ColMarker = pair(theme.Marker, theme.ListBg)
 	}
 	ColCurrent = pair(theme.Current, theme.DarkBg)
 	ColCurrentMatch = pair(theme.CurrentMatch, theme.DarkBg)

test/lib/common.rb

@@ -24,7 +24,7 @@ DEFAULT_TIMEOUT = 10
 FILE = File.expand_path(__FILE__)
 BASE = File.expand_path('../..', __dir__)
 Dir.chdir(BASE)
-FZF = "FZF_DEFAULT_OPTS=\"--no-scrollbar --pointer \\> --marker \\>\" FZF_DEFAULT_COMMAND= #{BASE}/bin/fzf".freeze
+FZF = %(FZF_DEFAULT_OPTS="--no-scrollbar --gutter ' ' --pointer '>' --marker '>'" FZF_DEFAULT_COMMAND= #{BASE}/bin/fzf).freeze
 
 def wait(timeout = DEFAULT_TIMEOUT)
   since = Time.now

test/test_core.rb

@@ -108,6 +108,40 @@ class TestCore < TestInteractive
     assert_equal %w[3 2 5 6 8 7], fzf_output_lines
   end
 
+  def test_subword_forward
+    tmux.send_keys "#{FZF} --bind K:kill-subword,F:forward-subword -q 'foo bar foo-bar fooFooBar'", :Enter, :Home
+    tmux.until { |lines| assert_equal '> foo bar foo-bar fooFooBar', lines.last }
+
+    tmux.send_keys 'F', :Delete
+    tmux.until { |lines| assert_equal '> foobar foo-bar fooFooBar', lines.last }
+
+    tmux.send_keys 'K'
+    tmux.until { |lines| assert_equal '> foo foo-bar fooFooBar', lines.last }
+
+    tmux.send_keys 'F', 'K'
+    tmux.until { |lines| assert_equal '> foo foo fooFooBar', lines.last }
+
+    tmux.send_keys 'F', 'F', 'K'
+    tmux.until { |lines| assert_equal '> foo foo fooFoo', lines.last }
+  end
+
+  def test_subword_backward
+    tmux.send_keys "#{FZF} --bind K:backward-kill-subword,B:backward-subword -q 'foo bar foo-bar fooBar'", :Enter
+    tmux.until { |lines| assert_equal '> foo bar foo-bar fooBar', lines.last }
+
+    tmux.send_keys 'B', :BSpace
+    tmux.until { |lines| assert_equal '> foo bar foo-bar foBar', lines.last }
+
+    tmux.send_keys 'K'
+    tmux.until { |lines| assert_equal '> foo bar foo-bar Bar', lines.last }
+
+    tmux.send_keys 'B', :BSpace
+    tmux.until { |lines| assert_equal '> foo bar foobar Bar', lines.last }
+
+    tmux.send_keys 'B', 'B', :BSpace
+    tmux.until { |lines| assert_equal '> foobar foobar Bar', lines.last }
+  end
+
   def test_multi_max
     tmux.send_keys "seq 1 10 | #{FZF} -m 3 --bind A:select-all,T:toggle-all --preview 'echo [{+}]/{}'", :Enter
 
@@ -1648,6 +1682,7 @@ class TestCore < TestInteractive
 
     tmux.send_keys %(seq 100 | #{FZF} --multi --reverse --preview-window 0 --preview 'env | grep ^FZF_ | sort > #{tempname}' --no-input --bind enter:show-input+refresh-preview,space:disable-search+refresh-preview), :Enter
     expected = {
+      FZF_DIRECTION: 'down',
       FZF_TOTAL_COUNT: '100',
       FZF_MATCH_COUNT: '100',
       FZF_SELECT_COUNT: '0',
@@ -1970,7 +2005,7 @@ class TestCore < TestInteractive
       end
     end
     elapsed = Time.now - time
-    assert elapsed < 2
+    assert_operator elapsed, :<, 2
   end
 
   def test_bg_cancel
@@ -1983,7 +2018,7 @@ class TestCore < TestInteractive
     tmux.until { assert_equal 2, it.match_count }
     tmux.send_keys :Space
     tmux.until { |lines| assert lines.any_include?('[0]') }
-    sleep 2
+    sleep(2)
     tmux.until do |lines|
       assert lines.any_include?('[0]')
       refute lines.any_include?('[1]')

test/test_exec.rb

@@ -403,7 +403,7 @@ class TestExec < TestInteractive
   end
 
   def test_become
-    tmux.send_keys "seq 100 | #{FZF} --bind 'enter:become:seq {} | #{FZF}'", :Enter
+    tmux.send_keys "seq 100 | fzf --bind 'enter:become:seq {} | fzf'", :Enter
     tmux.until { |lines| assert_equal 100, lines.match_count }
     tmux.send_keys 999
     tmux.until { |lines| assert_equal 0, lines.match_count }

test/test_layout.rb

@@ -178,8 +178,8 @@ class TestLayout < TestInteractive
     tmux.send_keys 'seq 3 | fzf --height ~100% --info=inline --border rounded', :Enter
     expected = <<~OUTPUT
       ╭──────────
-      │   3
+      │ ▌ 3
-      │   2
+      │ ▌ 2
       │ > 1
       │ >   < 3/3
       ╰──────────
@@ -197,8 +197,8 @@ class TestLayout < TestInteractive
       │ │
       │ │
       │ ╰────────
-      │   3
+      │ ▌ 3
-      │   2
+      │ ▌ 2
       │ > 1
       │ >   < 3/3
       ╰──────────
@@ -247,7 +247,7 @@ class TestLayout < TestInteractive
     tmux.send_keys 'seq 100 | fzf --height ~5 --info=inline --border rounded', :Enter
     expected = <<~OUTPUT
       ╭──────────────
-      │   2
+      │ ▌ 2
       │ > 1
       │ >   < 100/100
       ╰──────────────
@@ -275,12 +275,12 @@ class TestLayout < TestInteractive
   def test_fzf_multi_line
     tmux.send_keys %[(echo -en '0\\0'; echo -en '1\\n2\\0'; seq 1000) | fzf --read0 --multi --bind load:select-all --border rounded], :Enter
     block = <<~BLOCK
-      │  ┃998
+      │ ▌┃998
-      │  ┃999
+      │ ▌┃999
-      │  ┃1000
+      │ ▌┃1000
-      │  ╹
+      │ ▌╹
-      │  ╻1
+      │ ▌╻1
-      │  ╹2
+      │ ▌╹2
       │ >>0
       │   3/3 (3)
       │ >
@@ -312,11 +312,11 @@ class TestLayout < TestInteractive
       │ >
       │   3/3 (3)
       │ >>0
-      │  ╻1
+      │ ▌╻1
-      │  ╹2
+      │ ▌╹2
-      │  ╻1
+      │ ▌╻1
-      │  ┃2
+      │ ▌┃2
-      │  ┃3
+      │ ▌┃3
     BLOCK
     tmux.until { assert_block(block, it) }
   end
@@ -1156,6 +1156,65 @@ class TestLayout < TestInteractive
     tmux.until { assert_block(block, it) }
   end
 
+  def test_gutter_default
+    tmux.send_keys %(seq 10 | fzf), :Enter
+    block = <<~BLOCK
+      ▌ 3
+      ▌ 2
+      > 1
+        10/10
+      >
+    BLOCK
+    tmux.until { assert_block(block, it) }
+  end
+
+  def test_gutter_default_no_unicode
+    tmux.send_keys %(seq 10 | fzf --no-unicode), :Enter
+    block = <<~BLOCK
+        3
+        2
+      > 1
+        10/10
+      >
+    BLOCK
+    tmux.until { assert_block(block, it) }
+  end
+
+  def test_gutter_custom
+    tmux.send_keys %(seq 10 | fzf --gutter x), :Enter
+    block = <<~BLOCK
+      x 3
+      x 2
+      > 1
+        10/10
+      >
+    BLOCK
+    tmux.until { assert_block(block, it) }
+  end
+
+  # https://github.com/junegunn/fzf/issues/4537
+  def test_no_scrollbar_preview_toggle
+    x = 'x' * 300
+    y = 'y' * 300
+    tmux.send_keys %(yes #{x} | head -1000 | fzf --bind 'tab:toggle-preview' --border --no-scrollbar --preview 'echo #{y}' --preview-window 'border-left'), :Enter
+
+    # │ ▌ xxxxxxxx·· │ yyyyyyyy│
+    tmux.until do |lines|
+      lines.any? { it.match?(/x·· │ y+│$/) }
+    end
+    tmux.send_keys :Tab
+
+    # │ ▌ xxxxxxxx·· │
+    tmux.until do |lines|
+      lines.none? { it.match?(/x··y│$/) }
+    end
+
+    tmux.send_keys :Tab
+    tmux.until do |lines|
+      lines.any? { it.match?(/x·· │ y+│$/) }
+    end
+  end
+
   def test_combinations
     skip unless ENV['LONGTEST']
 

test/test_raw.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require_relative 'lib/common'
+
+# Testing raw mode
+class TestRaw < TestInteractive
+  def test_raw_mode
+    tmux.send_keys %(seq 1000 | #{FZF} --raw --bind ctrl-x:toggle-raw,a:enable-raw,b:disable-raw --gutter '▌' --multi --bind 'space:transform-prompt:echo "[[$FZF_RAW]] "'), :Enter
+    tmux.until { assert_equal 1000, it.match_count }
+
+    tmux.send_keys 1
+    tmux.until { assert_equal 272, it.match_count }
+
+    tmux.send_keys :Up
+    tmux.until { assert_includes it, '> 2' }
+
+    tmux.send_keys 'C-p'
+    tmux.until do
+      assert_includes it, '> 10'
+      assert_includes it, '▖ 9'
+    end
+
+    tmux.send_keys 'C-x'
+    tmux.until do
+      assert_includes it, '> 10'
+      assert_includes it, '▌ 1'
+    end
+
+    tmux.send_keys :Up, 'C-x'
+    tmux.until do
+      assert_includes it, '> 11'
+      assert_includes it, '▖ 10'
+    end
+
+    tmux.send_keys 1
+    tmux.until { assert_equal 28, it.match_count }
+
+    tmux.send_keys 'C-p'
+    tmux.until do
+      assert_includes it, '> 101'
+      assert_includes it, '▖ 100'
+    end
+
+    tmux.send_keys 'C-n'
+    tmux.until do
+      assert_includes it, '> 11'
+      assert_includes it, '▖ 10'
+    end
+
+    tmux.send_keys :Tab, :Tab, :Tab
+    tmux.until { assert_equal 3, it.select_count }
+
+    tmux.send_keys 'C-x'
+    tmux.until do
+      assert_equal 1, it.select_count
+      assert_includes it, '▌ 110'
+      assert_includes it, '>>11'
+    end
+
+    tmux.send_keys 'a'
+    tmux.until do
+      assert_equal 1, it.select_count
+      assert_includes it, '>>11'
+      assert_includes it, '▖ 10'
+    end
+
+    tmux.send_keys :Down, :Space
+    tmux.until { assert_includes it, '[[0]] 11' }
+
+    tmux.send_keys :Up, :Space
+    tmux.until { assert_includes it, '[[1]] 11' }
+
+    tmux.send_keys 'b'
+    tmux.until do
+      assert_equal 1, it.select_count
+      assert_includes it, '▌ 110'
+      assert_includes it, '>>11'
+    end
+
+    tmux.send_keys :Space
+    tmux.until { assert_includes it, '[[]] 11' }
+
+    tmux.send_keys 'C-u', '5'
+    tmux.until { assert_includes it, '> 5' }
+
+    tmux.send_keys 'C-x', 'C-p', 'C-p'
+    tmux.until do
+      assert_includes it, '> 25'
+      assert_includes it, '▖ 24'
+    end
+
+    tmux.send_keys 'C-x'
+    tmux.until do
+      assert_includes it, '> 25'
+      assert_includes it, '▌ 15'
+    end
+
+    # 35 is the closest match in raw mode
+    tmux.send_keys 'C-x', :Up, :Up, :Up, :Up, :Up, :Up, 'C-x'
+    tmux.until do
+      assert_includes it, '> 35'
+      assert_includes it, '▌ 25'
+    end
+  end
+
+  def test_raw_best
+    tmux.send_keys %(seq 1000 | #{FZF} --raw --bind space:best), :Enter
+    tmux.send_keys 999
+    tmux.until { assert_includes it, '> 1' }
+    tmux.send_keys :Space
+    tmux.until { assert_includes it, '> 999' }
+  end
+end

uninstall

@@ -109,6 +109,6 @@ if [ -d "${fish_dir}/functions" ]; then
 fi
 
 config_dir=$(dirname "$prefix_expand")
-if [[ "$xdg" = 1 ]] && [[ "$config_dir" = */fzf ]] && [[ -d "$config_dir" ]]; then
+if [[ $xdg == 1 ]] && [[ $config_dir == */fzf ]] && [[ -d $config_dir ]]; then
   rmdir "$config_dir"
 fi