0.10.9

This prevents fzf from missing SIGWINCH during startup which
occasionally happens with fzf-tmux

CHANGELOG.md

@@ -1,6 +1,21 @@
 CHANGELOG
 =========
 
+0.10.9
+------
+
+- Extended-search mode is now enabled by default
+    - `--extended-exact` is deprecated and instead we have `--exact` for
+      orthogonally controlling "exactness" of search
+- Fixed not to display non-printable characters
+- Added `double-click` for `--bind` option
+- More robust handling of SIGWINCH
+
+0.10.8
+------
+
+- Fixed panic when trying to set colors after colors are disabled (#370)
+
 0.10.7
 ------
 

README.md

@@ -68,7 +68,7 @@ Or you can have [vim-plug](https://github.com/junegunn/vim-plug) manage fzf
 (recommended):
 
 ```vim
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': 'yes \| ./install' }
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 ```
 
 #### Upgrading fzf
@@ -110,7 +110,7 @@ vim $(fzf)
 
 #### Extended-search mode
 
-With `-x` or `--extended` option, fzf will start in "extended-search mode".
+Since 0.10.9, fzf starts in "extended-search mode" by default.
 
 In this mode, you can specify multiple patterns delimited by spaces,
 such as: `^music .mp3$ sbtrkt !rmx`
@@ -125,15 +125,15 @@ such as: `^music .mp3$ sbtrkt !rmx`
 | `!'fire` | Items that do not include `fire` | inverse-exact-match  |
 
 If you don't prefer fuzzy matching and do not wish to "quote" every word,
-start fzf with `-e` or `--extended-exact` option. Note that in
-`--extended-exact` mode, `'`-prefix "unquotes" the term.
+start fzf with `-e` or `--exact` option. Note that when  `--exact` is set,
+`'`-prefix "unquotes" the term.
 
 #### Environment variables
 
 - `FZF_DEFAULT_COMMAND`
     - Default command to use when input is tty
 - `FZF_DEFAULT_OPTS`
-    - Default options. e.g. `export FZF_DEFAULT_OPTS="--extended --cycle"`
+    - Default options. e.g. `export FZF_DEFAULT_OPTS="--reverse --inline-info"`
 
 Examples
 --------
@@ -355,7 +355,8 @@ speed of the traversal.
 ```sh
 export FZF_DEFAULT_COMMAND='
   (git ls-tree -r --name-only HEAD ||
-   find * -name ".*" -prune -o -type f -print -o -type l -print) 2> /dev/null'
+   find . -path "*/\.*" -prune -o -type f -print -o -type l -print |
+      sed s/^..//) 2> /dev/null'
 ```
 
 #### Fish shell

install

@@ -1,12 +1,60 @@
 #!/usr/bin/env bash
 
-[[ "$@" =~ --pre ]] && version=0.10.7 pre=1 ||
-                       version=0.10.7 pre=0
+set -u
+
+[[ "$@" =~ --pre ]] && version=0.10.9 pre=1 ||
+                       version=0.10.9 pre=0
+
+auto_completion=
+key_bindings=
+update_config=1
+
+help() {
+  cat << EOF
+usage: $0 [OPTIONS]
+
+    --help               Show this message
+    --bin                Download fzf binary only
+    --all                Download fzf binary and update configuration files
+                         to enable key bindings and fuzzy completion
+    --[no-]key-bindings  Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)
+    --[no-]completion    Enable/disable fuzzy completion (bash & zsh)
+    --[no-]update-rc     Whether or not to update shell configuration files
+
+EOF
+}
+
+for opt in $@; do
+  case $opt in
+    --help)
+      help
+      exit 0
+      ;;
+    --all)
+      auto_completion=1
+      key_bindings=1
+      update_config=1
+      ;;
+    --key-bindings)    key_bindings=1    ;;
+    --no-key-bindings) key_bindings=0    ;;
+    --completion)      auto_completion=1 ;;
+    --no-completion)   auto_completion=0 ;;
+    --update-rc)       update_config=1   ;;
+    --no-update-rc)    update_config=0   ;;
+    --bin)             ;;
+    *)
+      echo "unknown option: $opt"
+      help
+      exit 1
+      ;;
+  esac
+done
 
 cd $(dirname $BASH_SOURCE)
-fzf_base=$(pwd)
+fzf_base="$(pwd)"
 
 # If stdin is a tty, we are "interactive".
+interactive=
 [ -t 0 ] && interactive=yes
 
 ask() {
@@ -16,7 +64,7 @@ ask() {
 
   read -p "$1 ([y]/n) " $read_n -r
   echo
-  [[ ! $REPLY =~ ^[Nn]$ ]]
+  [[ $REPLY =~ ^[Nn]$ ]]
 }
 
 check_binary() {
@@ -55,9 +103,16 @@ download() {
     if [ -x "$fzf_base"/bin/fzf ]; then
       echo "  - Already exists"
       check_binary && return
-    elif [ -x "$fzf_base"/bin/$1 ]; then
+    fi
+    if [ -x "$fzf_base"/bin/$1 ]; then
       symlink $1 && check_binary && return
     fi
+    if which_fzf="$(which fzf 2> /dev/null)"; then
+      echo "  - Found in \$PATH"
+      echo "  - Creating symlink: $which_fzf -> bin/fzf"
+      (cd "$fzf_base"/bin && rm -f fzf && ln -sf "$which_fzf" fzf)
+      check_binary && return
+    fi
   fi
   mkdir -p "$fzf_base"/bin && cd "$fzf_base"/bin
   if [ $? -ne 0 ]; then
@@ -173,12 +228,16 @@ fi
 [[ "$*" =~ "--bin" ]] && exit 0
 
 # Auto-completion
-ask "Do you want to add auto-completion support?"
-auto_completion=$?
+if [ -z "$auto_completion" ]; then
+  ask "Do you want to enable fuzzy auto-completion?"
+  auto_completion=$?
+fi
 
 # Key-bindings
-ask "Do you want to add key bindings?"
-key_bindings=$?
+if [ -z "$key_bindings" ]; then
+  ask "Do you want to enable key bindings?"
+  key_bindings=$?
+fi
 
 echo
 for shell in bash zsh; do
@@ -186,12 +245,12 @@ for shell in bash zsh; do
   src=~/.fzf.${shell}
 
   fzf_completion="[[ \$- == *i* ]] && source \"$fzf_base/shell/completion.${shell}\" 2> /dev/null"
-  if [ $auto_completion -ne 0 ]; then
+  if [ $auto_completion -eq 0 ]; then
     fzf_completion="# $fzf_completion"
   fi
 
   fzf_key_bindings="source \"$fzf_base/shell/key-bindings.${shell}\""
-  if [ $key_bindings -ne 0 ]; then
+  if [ $key_bindings -eq 0 ]; then
     fzf_key_bindings="# $fzf_key_bindings"
   fi
 
@@ -237,29 +296,45 @@ EOF
     rm -f ~/.config/fish/functions/fzf.fish && echo "OK" || echo "Failed"
   fi
 
-  if [ $key_bindings -eq 0 ]; then
-    echo -n "Symlink ~/.config/fish/functions/fzf_key_bindings.fish ... "
-    ln -sf $fzf_base/shell/key-bindings.fish \
-           ~/.config/fish/functions/fzf_key_bindings.fish && echo "OK" || echo "Failed"
+  fish_binding=~/.config/fish/functions/fzf_key_bindings.fish
+  if [ $key_bindings -ne 0 ]; then
+    echo -n "Symlink $fish_binding ... "
+    ln -sf "$fzf_base/shell/key-bindings.fish" \
+           "$fish_binding" && echo "OK" || echo "Failed"
+  else
+    echo -n "Removing $fish_binding ... "
+    rm -f "$fish_binding"
+    echo "OK"
   fi
 fi
 
 append_line() {
   set -e
-  echo "Update $2:"
-  echo "  - $1"
-  [ -f "$2" ] || touch "$2"
-  if [ $# -lt 3 ]; then
-    line=$(\grep -nF "$1" "$2" | sed 's/:.*//' | tr '\n' ' ')
+
+  local skip line file pat lno
+  skip="$1"
+  line="$2"
+  file="$3"
+  pat="${4:-}"
+
+  echo "Update $file:"
+  echo "  - $line"
+  [ -f "$file" ] || touch "$file"
+  if [ $# -lt 4 ]; then
+    lno=$(\grep -nF "$line" "$file" | sed 's/:.*//' | tr '\n' ' ')
   else
-    line=$(\grep -nF "$3" "$2" | sed 's/:.*//' | tr '\n' ' ')
+    lno=$(\grep -nF "$pat" "$file" | sed 's/:.*//' | tr '\n' ' ')
   fi
-  if [ -n "$line" ]; then
-    echo "    - Already exists: line #$line"
+  if [ -n "$lno" ]; then
+    echo "    - Already exists: line #$lno"
   else
-    echo >> "$2"
-    echo "$1" >> "$2"
-    echo "    + Added"
+    if [ $skip -eq 1 ]; then
+      echo >> "$file"
+      echo "$line" >> "$file"
+      echo "    + Added"
+    else
+      echo "    ~ Skipped"
+    fi
   fi
   echo
   set +e
@@ -267,12 +342,12 @@ append_line() {
 
 echo
 for shell in bash zsh; do
-  append_line "[ -f ~/.fzf.${shell} ] && source ~/.fzf.${shell}" ~/.${shell}rc "~/.fzf.${shell}"
+  append_line $update_config "[ -f ~/.fzf.${shell} ] && source ~/.fzf.${shell}" ~/.${shell}rc "~/.fzf.${shell}"
 done
 
-if [ $key_bindings -eq 0 -a $has_fish -eq 1 ]; then
+if [ $key_bindings -eq 1 -a $has_fish -eq 1 ]; then
   bind_file=~/.config/fish/functions/fish_user_key_bindings.fish
-  append_line "fzf_key_bindings" "$bind_file"
+  append_line $update_config "fzf_key_bindings" "$bind_file"
 fi
 
 cat << EOF

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 "Oct 2015" "fzf 0.10.7" "fzf - a command-line fuzzy finder"
+.TH fzf 1 "Nov 2015" "fzf 0.10.9" "fzf - a command-line fuzzy finder"
 
 .SH NAME
 fzf - a command-line fuzzy finder
@@ -36,10 +36,11 @@ fzf is a general-purpose command-line fuzzy finder.
 .SS Search mode
 .TP
 .B "-x, --extended"
-Extended-search mode
+Extended-search mode. Since 0.10.9, this is enabled by default. You can disable
+it with \fB+x\fR or \fB--no-extended\fR.
 .TP
-.B "-e, --extended-exact"
-Extended-search mode (exact match)
+.B "-e, --exact"
+Enable exact-match
 .TP
 .B "-i"
 Case-insensitive match (default: smart-case match)
@@ -179,11 +180,11 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
 .RE
 
 .RS
-.B AVAILABLE KEYS:
+.B AVAILABLE KEYS:    (SYNONYMS)
     \fIctrl-[a-z]\fR
     \fIalt-[a-z]\fR
     \fIf[1-4]\fR
-    \fIenter\fR       (\fIreturn\fR)
+    \fIenter\fR       (\fIreturn\fR \fIctrl-m\fR)
     \fIspace\fR
     \fIbspace\fR      (\fIbs\fR)
     \fIalt-bspace\fR  (\fIalt-bs\fR)
@@ -201,13 +202,14 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
     \fIpgdn\fR        (\fIpage-down\fR)
     \fIshift-left\fR
     \fIshift-right\fR
+    \fIdouble-click\fR
     or any single character
 .RE
 
 .RS
   \fBACTION:               DEFAULT BINDINGS:
     \fBabort\fR                 \fIctrl-c  ctrl-g  ctrl-q  esc\fR
-    \fBaccept\fR                \fIctrl-m  (enter)\fR
+    \fBaccept\fR                \fIenter   double-click\fR
     \fBbackward-char\fR         \fIctrl-b  left\fR
     \fBbackward-delete-char\fR  \fIctrl-h  bspace\fR
     \fBbackward-kill-word\fR    \fIalt-bs\fR
@@ -369,9 +371,9 @@ of field index expressions.
 
 .SH EXTENDED SEARCH MODE
 
-With \fB-x\fR or \fB--extended\fR option, fzf will start in "extended-search
-mode". In this mode, you can specify multiple patterns delimited by spaces,
-such as: \fB'wild ^music .mp3$ sbtrkt !rmx\fR
+Unless specified otherwise, fzf will start in "extended-search mode". In this
+mode, you can specify multiple patterns delimited by spaces, such as: \fB'wild
+^music .mp3$ sbtrkt !rmx\fR
 
 .SS Exact-match (quoted)
 A term that is prefixed by a single-quote character (\fB'\fR) is interpreted as
@@ -387,11 +389,10 @@ with the given string. An anchored-match term is also an exact-match term.
 If a term is prefixed by \fB!\fR, fzf will exclude the items that satisfy the
 term from the result.
 
-.SS Extended-exact mode
+.SS Exact-match by default
 If you don't prefer fuzzy matching and do not wish to "quote" (prefixing with
-\fB'\fR) every word, start fzf with \fB-e\fR or \fB--extended-exact\fR option
-(instead of \fB-x\fR or \fB--extended\fR). Note that in \fB--extended-exact\fR
-mode, \fB'\fR-prefix "unquotes" the term.
+\fB'\fR) every word, start fzf with \fB-e\fR or \fB--exact\fR option. Note that
+when \fB--exact\fR is set, \fB'\fR-prefix "unquotes" the term.
 
 .SH AUTHOR
 Junegunn Choi (\fIjunegunn.c@gmail.com\fR)

plugin/fzf.vim

@@ -357,6 +357,7 @@ function! s:execute_term(dict, command, temps)
   endfunction
 
   call termopen(a:command, fzf)
+  setf fzf
   startinsert
   return []
 endfunction
@@ -416,6 +417,9 @@ function! s:cmd_callback(lines) abort
     set noautochdir
     for item in a:lines
       execute cmd s:escape(item)
+      if exists('#BufEnter') && isdirectory(item)
+        doautocmd BufEnter
+      endif
     endfor
   finally
     let &autochdir = autochdir

shell/completion.bash

@@ -11,8 +11,8 @@
 # - $FZF_COMPLETION_OPTS    (default: empty)
 
 _fzf_orig_completion_filter() {
-  sed 's/.*-F *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\2=\1;/' |
-  sed 's/[^a-z0-9_= ;]/_/g'
+  sed 's/^\(.*-F\) *\([^ ]*\).* \([^ ]*\)$/export _fzf_orig_completion_\3="\1 %s \3 #\2";/' |
+  awk -F= '{gsub(/[^a-z0-9_= ;]/, "_", $1); print $1"="$2}'
 }
 
 _fzf_opts_completion() {
@@ -22,7 +22,7 @@ _fzf_opts_completion() {
   prev="${COMP_WORDS[COMP_CWORD-1]}"
   opts="
     -x --extended
-    -e --extended-exact
+    -e --exact
     -i +i
     -n --nth
     -d --delimiter
@@ -77,12 +77,12 @@ _fzf_opts_completion() {
 }
 
 _fzf_handle_dynamic_completion() {
-  local cmd orig ret orig_cmd
+  local cmd orig_var orig ret orig_cmd
   cmd="$1"
   shift
   orig_cmd="$1"
-
-  orig=$(eval "echo \$_fzf_orig_completion_$cmd")
+  orig_var="_fzf_orig_completion_$cmd"
+  orig="${!orig_var##*#}"
   if [ -n "$orig" ] && type "$orig" > /dev/null 2>&1; then
     $orig "$@"
   elif [ -n "$_fzf_completion_loader" ]; then
@@ -252,32 +252,48 @@ a_cmds="
 x_cmds="kill ssh telnet unset unalias export"
 
 # Preserve existing completion
-if [ "$_fzf_completion_loaded" != '0.9.12' ]; then
+if [ "$_fzf_completion_loaded" != '0.10.8' ]; then
   # Really wish I could use associative array but OSX comes with bash 3.2 :(
   eval $(complete | \grep '\-F' | \grep -v _fzf_ |
     \grep -E " ($(echo $d_cmds $f_cmds $a_cmds $x_cmds | sed 's/ /|/g' | sed 's/+/\\+/g'))$" | _fzf_orig_completion_filter)
-  export _fzf_completion_loaded=0.9.12
+  export _fzf_completion_loaded=0.10.8
 fi
 
 if type _completion_loader > /dev/null 2>&1; then
   _fzf_completion_loader=1
 fi
 
+_fzf_defc() {
+  local cmd func opts orig_var orig
+  cmd="$1"
+  func="$2"
+  opts="$3"
+  orig_var="_fzf_orig_completion_$cmd"
+  orig="${!orig_var}"
+  if [ -n "$orig" ]; then
+    eval "$(printf "$orig" "$func")"
+  else
+    complete -F "$func" $opts "$cmd"
+  fi
+}
+
 # Directory
 for cmd in $d_cmds; do
-  complete -F _fzf_dir_completion -o nospace -o plusdirs $cmd
+  _fzf_defc "$cmd" _fzf_dir_completion "-o nospace -o plusdirs"
 done
 
 # File
 for cmd in $f_cmds; do
-  complete -F _fzf_file_completion -o default -o bashdefault $cmd
+  _fzf_defc "$cmd" _fzf_file_completion "-o default -o bashdefault"
 done
 
 # Anything
 for cmd in $a_cmds; do
-  complete -F _fzf_path_completion -o default -o bashdefault $cmd
+  _fzf_defc "$cmd" _fzf_path_completion "-o default -o bashdefault"
 done
 
+unset _fzf_defc
+
 # Kill completion
 complete -F _fzf_complete_kill -o nospace -o default -o bashdefault kill
 

src/constants.go

@@ -8,7 +8,7 @@ import (
 
 const (
 	// Current version
-	version = "0.10.7"
+	version = "0.10.9"
 
 	// Core
 	coordinatorDelayMax  time.Duration = 100 * time.Millisecond

src/core.go

@@ -143,7 +143,7 @@ func Run(opts *Options) {
 	// Matcher
 	patternBuilder := func(runes []rune) *Pattern {
 		return BuildPattern(
-			opts.Mode, opts.Case, opts.Tiebreak != byEnd,
+			opts.Fuzzy, opts.Extended, opts.Case, opts.Tiebreak != byEnd,
 			opts.Nth, opts.Delimiter, runes)
 	}
 	matcher := NewMatcher(patternBuilder, sort, opts.Tac, eventBox)

src/curses/curses.go

@@ -4,13 +4,14 @@ package curses
 #include <ncurses.h>
 #include <locale.h>
 #cgo !static LDFLAGS: -lncurses
-#cgo static LDFLAGS: -l:libncurses.a -l:libtinfo.a -l:libgpm.a -ldl
+#cgo static LDFLAGS: -l:libncursesw.a -l:libtinfo.a -l:libgpm.a -ldl
 */
 import "C"
 
 import (
 	"fmt"
 	"os"
+	"strings"
 	"syscall"
 	"time"
 	"unicode/utf8"
@@ -50,6 +51,7 @@ const (
 
 	Invalid
 	Mouse
+	DoubleClick
 
 	BTab
 	BSpace
@@ -513,7 +515,12 @@ func MoveAndClear(y int, x int) {
 }
 
 func Print(text string) {
-	C.addstr(C.CString(text))
+	C.addstr(C.CString(strings.Map(func(r rune) rune {
+		if r < 32 {
+			return -1
+		}
+		return r
+	}, text)))
 }
 
 func CPrint(pair int, bold bool, text string) {

src/options.go

@@ -16,7 +16,8 @@ const usage = `usage: fzf [options]
 
   Search
     -x, --extended        Extended-search mode
-    -e, --extended-exact  Extended-search mode (exact match)
+                          (enabled by default; +x or --no-extended to disable)
+    -e, --exact           Enable Exact-match
     -i                    Case-insensitive match (default: smart-case match)
     +i                    Case-sensitive match
     -n, --nth=N[,..]      Comma-separated list of field index expressions
@@ -58,20 +59,10 @@ const usage = `usage: fzf [options]
 
   Environment variables
     FZF_DEFAULT_COMMAND   Default command to use when input is tty
-    FZF_DEFAULT_OPTS      Defaults options. (e.g. '-x -m')
+    FZF_DEFAULT_OPTS      Defaults options. (e.g. '--reverse --inline-info')
 
 `
 
-// Mode denotes the current search mode
-type Mode int
-
-// Search modes
-const (
-	ModeFuzzy Mode = iota
-	ModeExtended
-	ModeExtendedExact
-)
-
 // Case denotes case-sensitivity of search
 type Case int
 
@@ -98,7 +89,8 @@ func defaultMargin() [4]string {
 
 // Options stores the values of command-line options
 type Options struct {
-	Mode        Mode
+	Fuzzy       bool
+	Extended    bool
 	Case        Case
 	Nth         []Range
 	WithNth     []Range
@@ -143,7 +135,8 @@ func defaultTheme() *curses.ColorTheme {
 
 func defaultOptions() *Options {
 	return &Options{
-		Mode:        ModeFuzzy,
+		Fuzzy:       true,
+		Extended:    true,
 		Case:        CaseSmart,
 		Nth:         make([]Range, 0),
 		WithNth:     make([]Range, 0),
@@ -343,6 +336,8 @@ func parseKeyChords(str string, message string) map[int]string {
 			chord = curses.SLeft
 		case "shift-right":
 			chord = curses.SRight
+		case "double-click":
+			chord = curses.DoubleClick
 		default:
 			if len(key) == 6 && strings.HasPrefix(lkey, "ctrl-") && isAlphabet(lkey[5]) {
 				chord = curses.CtrlA + int(lkey[5]) - 'a'
@@ -380,8 +375,11 @@ func parseTiebreak(str string) tiebreak {
 }
 
 func dupeTheme(theme *curses.ColorTheme) *curses.ColorTheme {
-	dupe := *theme
-	return &dupe
+	if theme != nil {
+		dupe := *theme
+		return &dupe
+	}
+	return nil
 }
 
 func parseTheme(defaultTheme *curses.ColorTheme, str string) *curses.ColorTheme {
@@ -402,7 +400,7 @@ func parseTheme(defaultTheme *curses.ColorTheme, str string) *curses.ColorTheme
 			}
 			// Color is disabled
 			if theme == nil {
-				errorExit("colors disabled; cannot customize colors")
+				continue
 			}
 
 			pair := strings.Split(str, ":")
@@ -679,11 +677,17 @@ func parseOptions(opts *Options, allArgs []string) {
 		case "-h", "--help":
 			help(exitOk)
 		case "-x", "--extended":
-			opts.Mode = ModeExtended
-		case "-e", "--extended-exact":
-			opts.Mode = ModeExtendedExact
-		case "+x", "--no-extended", "+e", "--no-extended-exact":
-			opts.Mode = ModeFuzzy
+			opts.Extended = true
+		case "-e", "--exact":
+			opts.Fuzzy = false
+		case "--extended-exact":
+			// Note that we now don't have --no-extended-exact
+			opts.Fuzzy = false
+			opts.Extended = true
+		case "+x", "--no-extended":
+			opts.Extended = false
+		case "+e", "--no-exact":
+			opts.Fuzzy = true
 		case "-q", "--query":
 			opts.Query = nextString(allArgs, &i, "query string required")
 		case "-f", "--filter":
@@ -868,7 +872,7 @@ func parseOptions(opts *Options, allArgs []string) {
 
 	// If we're not using extended search mode, --nth option becomes irrelevant
 	// if it contains the whole range
-	if opts.Mode == ModeFuzzy || len(opts.Nth) == 1 {
+	if !opts.Extended || len(opts.Nth) == 1 {
 		for _, r := range opts.Nth {
 			if r.begin == rangeEllipsis && r.end == rangeEllipsis {
 				opts.Nth = make([]Range, 0)

src/options_test.go

@@ -100,7 +100,7 @@ func TestIrrelevantNth(t *testing.T) {
 			t.Errorf("nth should be empty: %s", opts.Nth)
 		}
 	}
-	for _, words := range [][]string{[]string{"--nth", "..,3"}, []string{"--nth", "3,1.."}, []string{"--nth", "..-1,1"}} {
+	for _, words := range [][]string{[]string{"--nth", "..,3", "+x"}, []string{"--nth", "3,1..", "+x"}, []string{"--nth", "..-1,1", "+x"}} {
 		{
 			opts := defaultOptions()
 			parseOptions(opts, words)
@@ -316,3 +316,15 @@ func TestColorSpec(t *testing.T) {
 		t.Errorf("using default colors")
 	}
 }
+
+func TestParseNilTheme(t *testing.T) {
+	var theme *curses.ColorTheme
+	newTheme := parseTheme(theme, "prompt:12")
+	if newTheme != nil {
+		t.Errorf("color is disabled. keep it that way.")
+	}
+	newTheme = parseTheme(theme, "prompt:12,dark,prompt:13")
+	if newTheme.Prompt != 13 {
+		t.Errorf("color should now be enabled and customized")
+	}
+}

src/pattern.go

@@ -38,7 +38,8 @@ type term struct {
 
 // Pattern represents search pattern
 type Pattern struct {
-	mode          Mode
+	fuzzy         bool
+	extended      bool
 	caseSensitive bool
 	forward       bool
 	text          []rune
@@ -63,7 +64,7 @@ func init() {
 
 func clearPatternCache() {
 	// We can uniquely identify the pattern for a given string since
-	// mode and caseMode do not change while the program is running
+	// search mode and caseMode do not change while the program is running
 	_patternCache = make(map[string]*Pattern)
 }
 
@@ -72,14 +73,13 @@ func clearChunkCache() {
 }
 
 // BuildPattern builds Pattern object from the given arguments
-func BuildPattern(mode Mode, caseMode Case, forward bool,
+func BuildPattern(fuzzy bool, extended bool, caseMode Case, forward bool,
 	nth []Range, delimiter Delimiter, runes []rune) *Pattern {
 
 	var asString string
-	switch mode {
-	case ModeExtended, ModeExtendedExact:
+	if extended {
 		asString = strings.Trim(string(runes), " ")
-	default:
+	} else {
 		asString = string(runes)
 	}
 
@@ -91,15 +91,14 @@ func BuildPattern(mode Mode, caseMode Case, forward bool,
 	caseSensitive, hasInvTerm := true, false
 	terms := []term{}
 
-	switch mode {
-	case ModeExtended, ModeExtendedExact:
-		terms = parseTerms(mode, caseMode, asString)
+	if extended {
+		terms = parseTerms(fuzzy, caseMode, asString)
 		for _, term := range terms {
 			if term.inv {
 				hasInvTerm = true
 			}
 		}
-	default:
+	} else {
 		lowerString := strings.ToLower(asString)
 		caseSensitive = caseMode == CaseRespect ||
 			caseMode == CaseSmart && lowerString != asString
@@ -109,7 +108,8 @@ func BuildPattern(mode Mode, caseMode Case, forward bool,
 	}
 
 	ptr := &Pattern{
-		mode:          mode,
+		fuzzy:         fuzzy,
+		extended:      extended,
 		caseSensitive: caseSensitive,
 		forward:       forward,
 		text:          []rune(asString),
@@ -129,7 +129,7 @@ func BuildPattern(mode Mode, caseMode Case, forward bool,
 	return ptr
 }
 
-func parseTerms(mode Mode, caseMode Case, str string) []term {
+func parseTerms(fuzzy bool, caseMode Case, str string) []term {
 	tokens := _splitRegex.Split(str, -1)
 	terms := []term{}
 	for _, token := range tokens {
@@ -141,7 +141,7 @@ func parseTerms(mode Mode, caseMode Case, str string) []term {
 			text = lowerText
 		}
 		origText := []rune(text)
-		if mode == ModeExtendedExact {
+		if !fuzzy {
 			typ = termExact
 		}
 
@@ -151,10 +151,11 @@ func parseTerms(mode Mode, caseMode Case, str string) []term {
 		}
 
 		if strings.HasPrefix(text, "'") {
-			if mode == ModeExtended {
+			// Flip exactness
+			if fuzzy {
 				typ = termExact
 				text = text[1:]
-			} else if mode == ModeExtendedExact {
+			} else {
 				typ = termFuzzy
 				text = text[1:]
 			}
@@ -185,7 +186,7 @@ func parseTerms(mode Mode, caseMode Case, str string) []term {
 
 // IsEmpty returns true if the pattern is effectively empty
 func (p *Pattern) IsEmpty() bool {
-	if p.mode == ModeFuzzy {
+	if !p.extended {
 		return len(p.text) == 0
 	}
 	return len(p.terms) == 0
@@ -198,7 +199,7 @@ func (p *Pattern) AsString() string {
 
 // CacheKey is used to build string to be used as the key of result cache
 func (p *Pattern) CacheKey() string {
-	if p.mode == ModeFuzzy {
+	if !p.extended {
 		return p.AsString()
 	}
 	cacheableTerms := []string{}
@@ -250,9 +251,9 @@ Loop:
 
 func (p *Pattern) matchChunk(chunk *Chunk) []*Item {
 	matches := []*Item{}
-	if p.mode == ModeFuzzy {
+	if !p.extended {
 		for _, item := range *chunk {
-			if sidx, eidx, tlen := p.fuzzyMatch(item); sidx >= 0 {
+			if sidx, eidx, tlen := p.basicMatch(item); sidx >= 0 {
 				matches = append(matches,
 					dupItem(item, []Offset{Offset{int32(sidx), int32(eidx), int32(tlen)}}))
 			}
@@ -269,8 +270,8 @@ func (p *Pattern) matchChunk(chunk *Chunk) []*Item {
 
 // MatchItem returns true if the Item is a match
 func (p *Pattern) MatchItem(item *Item) bool {
-	if p.mode == ModeFuzzy {
-		sidx, _, _ := p.fuzzyMatch(item)
+	if !p.extended {
+		sidx, _, _ := p.basicMatch(item)
 		return sidx >= 0
 	}
 	offsets := p.extendedMatch(item)
@@ -289,9 +290,12 @@ func dupItem(item *Item, offsets []Offset) *Item {
 		rank:        Rank{0, 0, item.index}}
 }
 
-func (p *Pattern) fuzzyMatch(item *Item) (int, int, int) {
+func (p *Pattern) basicMatch(item *Item) (int, int, int) {
 	input := p.prepareInput(item)
-	return p.iter(algo.FuzzyMatch, input, p.caseSensitive, p.forward, p.text)
+	if p.fuzzy {
+		return p.iter(algo.FuzzyMatch, input, p.caseSensitive, p.forward, p.text)
+	}
+	return p.iter(algo.ExactMatchNaive, input, p.caseSensitive, p.forward, p.text)
 }
 
 func (p *Pattern) extendedMatch(item *Item) []Offset {

src/pattern_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestParseTermsExtended(t *testing.T) {
-	terms := parseTerms(ModeExtended, CaseSmart,
+	terms := parseTerms(true, CaseSmart,
 		"aaa 'bbb ^ccc ddd$ !eee !'fff !^ggg !hhh$ ^iii$")
 	if len(terms) != 9 ||
 		terms[0].typ != termFuzzy || terms[0].inv ||
@@ -33,7 +33,7 @@ func TestParseTermsExtended(t *testing.T) {
 }
 
 func TestParseTermsExtendedExact(t *testing.T) {
-	terms := parseTerms(ModeExtendedExact, CaseSmart,
+	terms := parseTerms(false, CaseSmart,
 		"aaa 'bbb ^ccc ddd$ !eee !'fff !^ggg !hhh$")
 	if len(terms) != 8 ||
 		terms[0].typ != termExact || terms[0].inv || len(terms[0].text) != 3 ||
@@ -49,7 +49,7 @@ func TestParseTermsExtendedExact(t *testing.T) {
 }
 
 func TestParseTermsEmpty(t *testing.T) {
-	terms := parseTerms(ModeExtended, CaseSmart, "' $ ^ !' !^ !$")
+	terms := parseTerms(true, CaseSmart, "' $ ^ !' !^ !$")
 	if len(terms) != 0 {
 		t.Errorf("%s", terms)
 	}
@@ -58,7 +58,7 @@ func TestParseTermsEmpty(t *testing.T) {
 func TestExact(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pattern := BuildPattern(ModeExtended, CaseSmart, true,
+	pattern := BuildPattern(true, true, CaseSmart, true,
 		[]Range{}, Delimiter{}, []rune("'abc"))
 	sidx, eidx := algo.ExactMatchNaive(
 		pattern.caseSensitive, pattern.forward, []rune("aabbcc abc"), pattern.terms[0].text)
@@ -70,7 +70,7 @@ func TestExact(t *testing.T) {
 func TestEqual(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pattern := BuildPattern(ModeExtended, CaseSmart, true, []Range{}, Delimiter{}, []rune("^AbC$"))
+	pattern := BuildPattern(true, true, CaseSmart, true, []Range{}, Delimiter{}, []rune("^AbC$"))
 
 	match := func(str string, sidxExpected int, eidxExpected int) {
 		sidx, eidx := algo.EqualMatch(
@@ -86,17 +86,17 @@ func TestEqual(t *testing.T) {
 func TestCaseSensitivity(t *testing.T) {
 	defer clearPatternCache()
 	clearPatternCache()
-	pat1 := BuildPattern(ModeFuzzy, CaseSmart, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat1 := BuildPattern(true, false, CaseSmart, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat2 := BuildPattern(ModeFuzzy, CaseSmart, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat2 := BuildPattern(true, false, CaseSmart, true, []Range{}, Delimiter{}, []rune("Abc"))
 	clearPatternCache()
-	pat3 := BuildPattern(ModeFuzzy, CaseIgnore, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat3 := BuildPattern(true, false, CaseIgnore, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat4 := BuildPattern(ModeFuzzy, CaseIgnore, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat4 := BuildPattern(true, false, CaseIgnore, true, []Range{}, Delimiter{}, []rune("Abc"))
 	clearPatternCache()
-	pat5 := BuildPattern(ModeFuzzy, CaseRespect, true, []Range{}, Delimiter{}, []rune("abc"))
+	pat5 := BuildPattern(true, false, CaseRespect, true, []Range{}, Delimiter{}, []rune("abc"))
 	clearPatternCache()
-	pat6 := BuildPattern(ModeFuzzy, CaseRespect, true, []Range{}, Delimiter{}, []rune("Abc"))
+	pat6 := BuildPattern(true, false, CaseRespect, true, []Range{}, Delimiter{}, []rune("Abc"))
 
 	if string(pat1.text) != "abc" || pat1.caseSensitive != false ||
 		string(pat2.text) != "Abc" || pat2.caseSensitive != true ||
@@ -109,19 +109,19 @@ func TestCaseSensitivity(t *testing.T) {
 }
 
 func TestOrigTextAndTransformed(t *testing.T) {
-	pattern := BuildPattern(ModeExtended, CaseSmart, true, []Range{}, Delimiter{}, []rune("jg"))
+	pattern := BuildPattern(true, true, CaseSmart, true, []Range{}, Delimiter{}, []rune("jg"))
 	tokens := Tokenize([]rune("junegunn"), Delimiter{})
 	trans := Transform(tokens, []Range{Range{1, 1}})
 
 	origRunes := []rune("junegunn.choi")
-	for _, mode := range []Mode{ModeFuzzy, ModeExtended} {
+	for _, extended := range []bool{false, true} {
 		chunk := Chunk{
 			&Item{
 				text:        []rune("junegunn"),
 				origText:    &origRunes,
 				transformed: trans},
 		}
-		pattern.mode = mode
+		pattern.extended = extended
 		matches := pattern.matchChunk(&chunk)
 		if string(matches[0].text) != "junegunn" || string(*matches[0].origText) != "junegunn.choi" ||
 			matches[0].offsets[0][0] != 0 || matches[0].offsets[0][1] != 5 ||

src/terminal.go

@@ -180,6 +180,7 @@ func defaultKeymap() map[int]actionType {
 
 	keymap[C.Rune] = actRune
 	keymap[C.Mouse] = actMouse
+	keymap[C.DoubleClick] = actAccept
 	return keymap
 }
 
@@ -712,21 +713,6 @@ func executeCommand(template string, current string) {
 func (t *Terminal) Loop() {
 	<-t.startChan
 	{ // Late initialization
-		t.mutex.Lock()
-		t.initFunc()
-		t.calculateMargins()
-		t.printPrompt()
-		t.placeCursor()
-		C.Refresh()
-		t.printInfo()
-		t.printHeader()
-		t.mutex.Unlock()
-		go func() {
-			timer := time.NewTimer(initialDelay)
-			<-timer.C
-			t.reqBox.Set(reqRefresh, nil)
-		}()
-
 		intChan := make(chan os.Signal, 1)
 		signal.Notify(intChan, os.Interrupt, os.Kill)
 		go func() {
@@ -743,6 +729,21 @@ func (t *Terminal) Loop() {
 			}
 		}()
 
+		t.mutex.Lock()
+		t.initFunc()
+		t.calculateMargins()
+		t.printPrompt()
+		t.placeCursor()
+		C.Refresh()
+		t.printInfo()
+		t.printHeader()
+		t.mutex.Unlock()
+		go func() {
+			timer := time.NewTimer(initialDelay)
+			<-timer.C
+			t.reqBox.Set(reqRefresh, nil)
+		}()
+
 		// Keep the spinner spinning
 		go func() {
 			for {
@@ -850,6 +851,209 @@ func (t *Terminal) Loop() {
 			}
 		}
 
+		var doAction func(actionType, int) bool
+		doAction = func(action actionType, mapkey int) bool {
+			switch action {
+			case actIgnore:
+			case actExecute:
+				if t.cy >= 0 && t.cy < t.merger.Length() {
+					item := t.merger.Get(t.cy)
+					executeCommand(t.execmap[mapkey], item.AsString(t.ansi))
+				}
+			case actInvalid:
+				t.mutex.Unlock()
+				return false
+			case actToggleSort:
+				t.sort = !t.sort
+				t.eventBox.Set(EvtSearchNew, t.sort)
+				t.mutex.Unlock()
+				return false
+			case actBeginningOfLine:
+				t.cx = 0
+			case actBackwardChar:
+				if t.cx > 0 {
+					t.cx--
+				}
+			case actAbort:
+				req(reqQuit)
+			case actDeleteChar:
+				t.delChar()
+			case actDeleteCharEOF:
+				if !t.delChar() && t.cx == 0 {
+					req(reqQuit)
+				}
+			case actEndOfLine:
+				t.cx = len(t.input)
+			case actCancel:
+				if len(t.input) == 0 {
+					req(reqQuit)
+				} else {
+					t.yanked = t.input
+					t.input = []rune{}
+					t.cx = 0
+				}
+			case actForwardChar:
+				if t.cx < len(t.input) {
+					t.cx++
+				}
+			case actBackwardDeleteChar:
+				if t.cx > 0 {
+					t.input = append(t.input[:t.cx-1], t.input[t.cx:]...)
+					t.cx--
+				}
+			case actSelectAll:
+				if t.multi {
+					for i := 0; i < t.merger.Length(); i++ {
+						item := t.merger.Get(i)
+						selectItem(item)
+					}
+					req(reqList, reqInfo)
+				}
+			case actDeselectAll:
+				if t.multi {
+					for i := 0; i < t.merger.Length(); i++ {
+						item := t.merger.Get(i)
+						delete(t.selected, item.index)
+					}
+					req(reqList, reqInfo)
+				}
+			case actToggle:
+				if t.multi && t.merger.Length() > 0 {
+					toggle()
+					req(reqList)
+				}
+			case actToggleAll:
+				if t.multi {
+					for i := 0; i < t.merger.Length(); i++ {
+						toggleY(i)
+					}
+					req(reqList, reqInfo)
+				}
+			case actToggleDown:
+				if t.multi && t.merger.Length() > 0 {
+					toggle()
+					t.vmove(-1)
+					req(reqList)
+				}
+			case actToggleUp:
+				if t.multi && t.merger.Length() > 0 {
+					toggle()
+					t.vmove(1)
+					req(reqList)
+				}
+			case actDown:
+				t.vmove(-1)
+				req(reqList)
+			case actUp:
+				t.vmove(1)
+				req(reqList)
+			case actAccept:
+				req(reqClose)
+			case actClearScreen:
+				req(reqRedraw)
+			case actUnixLineDiscard:
+				if t.cx > 0 {
+					t.yanked = copySlice(t.input[:t.cx])
+					t.input = t.input[t.cx:]
+					t.cx = 0
+				}
+			case actUnixWordRubout:
+				if t.cx > 0 {
+					t.rubout("\\s\\S")
+				}
+			case actBackwardKillWord:
+				if t.cx > 0 {
+					t.rubout("[^[:alnum:]][[:alnum:]]")
+				}
+			case actYank:
+				suffix := copySlice(t.input[t.cx:])
+				t.input = append(append(t.input[:t.cx], t.yanked...), suffix...)
+				t.cx += len(t.yanked)
+			case actPageUp:
+				t.vmove(t.maxItems() - 1)
+				req(reqList)
+			case actPageDown:
+				t.vmove(-(t.maxItems() - 1))
+				req(reqList)
+			case actBackwardWord:
+				t.cx = findLastMatch("[^[:alnum:]][[:alnum:]]", string(t.input[:t.cx])) + 1
+			case actForwardWord:
+				t.cx += findFirstMatch("[[:alnum:]][^[:alnum:]]|(.$)", string(t.input[t.cx:])) + 1
+			case actKillWord:
+				ncx := t.cx +
+					findFirstMatch("[[:alnum:]][^[:alnum:]]|(.$)", 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:])
+					t.input = t.input[:t.cx]
+				}
+			case actRune:
+				prefix := copySlice(t.input[:t.cx])
+				t.input = append(append(prefix, event.Char), t.input[t.cx:]...)
+				t.cx++
+			case actPreviousHistory:
+				if t.history != nil {
+					t.history.override(string(t.input))
+					t.input = []rune(t.history.previous())
+					t.cx = len(t.input)
+				}
+			case actNextHistory:
+				if t.history != nil {
+					t.history.override(string(t.input))
+					t.input = []rune(t.history.next())
+					t.cx = len(t.input)
+				}
+			case actMouse:
+				me := event.MouseEvent
+				mx, my := me.X, me.Y
+				if me.S != 0 {
+					// Scroll
+					if t.merger.Length() > 0 {
+						if t.multi && me.Mod {
+							toggle()
+						}
+						t.vmove(me.S)
+						req(reqList)
+					}
+				} else if mx >= t.marginInt[3] && mx < C.MaxX()-t.marginInt[1] &&
+					my >= t.marginInt[0] && my < C.MaxY()-t.marginInt[2] {
+					mx -= t.marginInt[3]
+					my -= t.marginInt[0]
+					mx = util.Constrain(mx-len(t.prompt), 0, len(t.input))
+					if !t.reverse {
+						my = t.maxHeight() - my - 1
+					}
+					min := 2 + len(t.header)
+					if t.inlineInfo {
+						min--
+					}
+					if me.Double {
+						// Double-click
+						if my >= min {
+							if t.vset(t.offset+my-min) && t.cy < t.merger.Length() {
+								return doAction(t.keymap[C.DoubleClick], C.DoubleClick)
+							}
+						}
+					} else if me.Down {
+						if my == 0 && mx >= 0 {
+							// Prompt
+							t.cx = mx
+						} else if my >= min {
+							// List
+							if t.vset(t.offset+my-min) && t.multi && me.Mod {
+								toggle()
+							}
+							req(reqList)
+						}
+					}
+				}
+			}
+			return true
+		}
 		action := t.keymap[event.Type]
 		mapkey := event.Type
 		if event.Type == C.Rune {
@@ -858,204 +1062,8 @@ func (t *Terminal) Loop() {
 				action = act
 			}
 		}
-		switch action {
-		case actIgnore:
-		case actExecute:
-			if t.cy >= 0 && t.cy < t.merger.Length() {
-				item := t.merger.Get(t.cy)
-				executeCommand(t.execmap[mapkey], item.AsString(t.ansi))
-			}
-		case actInvalid:
-			t.mutex.Unlock()
+		if !doAction(action, mapkey) {
 			continue
-		case actToggleSort:
-			t.sort = !t.sort
-			t.eventBox.Set(EvtSearchNew, t.sort)
-			t.mutex.Unlock()
-			continue
-		case actBeginningOfLine:
-			t.cx = 0
-		case actBackwardChar:
-			if t.cx > 0 {
-				t.cx--
-			}
-		case actAbort:
-			req(reqQuit)
-		case actDeleteChar:
-			t.delChar()
-		case actDeleteCharEOF:
-			if !t.delChar() && t.cx == 0 {
-				req(reqQuit)
-			}
-		case actEndOfLine:
-			t.cx = len(t.input)
-		case actCancel:
-			if len(t.input) == 0 {
-				req(reqQuit)
-			} else {
-				t.yanked = t.input
-				t.input = []rune{}
-				t.cx = 0
-			}
-		case actForwardChar:
-			if t.cx < len(t.input) {
-				t.cx++
-			}
-		case actBackwardDeleteChar:
-			if t.cx > 0 {
-				t.input = append(t.input[:t.cx-1], t.input[t.cx:]...)
-				t.cx--
-			}
-		case actSelectAll:
-			if t.multi {
-				for i := 0; i < t.merger.Length(); i++ {
-					item := t.merger.Get(i)
-					selectItem(item)
-				}
-				req(reqList, reqInfo)
-			}
-		case actDeselectAll:
-			if t.multi {
-				for i := 0; i < t.merger.Length(); i++ {
-					item := t.merger.Get(i)
-					delete(t.selected, item.index)
-				}
-				req(reqList, reqInfo)
-			}
-		case actToggle:
-			if t.multi && t.merger.Length() > 0 {
-				toggle()
-				req(reqList)
-			}
-		case actToggleAll:
-			if t.multi {
-				for i := 0; i < t.merger.Length(); i++ {
-					toggleY(i)
-				}
-				req(reqList, reqInfo)
-			}
-		case actToggleDown:
-			if t.multi && t.merger.Length() > 0 {
-				toggle()
-				t.vmove(-1)
-				req(reqList)
-			}
-		case actToggleUp:
-			if t.multi && t.merger.Length() > 0 {
-				toggle()
-				t.vmove(1)
-				req(reqList)
-			}
-		case actDown:
-			t.vmove(-1)
-			req(reqList)
-		case actUp:
-			t.vmove(1)
-			req(reqList)
-		case actAccept:
-			req(reqClose)
-		case actClearScreen:
-			req(reqRedraw)
-		case actUnixLineDiscard:
-			if t.cx > 0 {
-				t.yanked = copySlice(t.input[:t.cx])
-				t.input = t.input[t.cx:]
-				t.cx = 0
-			}
-		case actUnixWordRubout:
-			if t.cx > 0 {
-				t.rubout("\\s\\S")
-			}
-		case actBackwardKillWord:
-			if t.cx > 0 {
-				t.rubout("[^[:alnum:]][[:alnum:]]")
-			}
-		case actYank:
-			suffix := copySlice(t.input[t.cx:])
-			t.input = append(append(t.input[:t.cx], t.yanked...), suffix...)
-			t.cx += len(t.yanked)
-		case actPageUp:
-			t.vmove(t.maxItems() - 1)
-			req(reqList)
-		case actPageDown:
-			t.vmove(-(t.maxItems() - 1))
-			req(reqList)
-		case actBackwardWord:
-			t.cx = findLastMatch("[^[:alnum:]][[:alnum:]]", string(t.input[:t.cx])) + 1
-		case actForwardWord:
-			t.cx += findFirstMatch("[[:alnum:]][^[:alnum:]]|(.$)", string(t.input[t.cx:])) + 1
-		case actKillWord:
-			ncx := t.cx +
-				findFirstMatch("[[:alnum:]][^[:alnum:]]|(.$)", 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:])
-				t.input = t.input[:t.cx]
-			}
-		case actRune:
-			prefix := copySlice(t.input[:t.cx])
-			t.input = append(append(prefix, event.Char), t.input[t.cx:]...)
-			t.cx++
-		case actPreviousHistory:
-			if t.history != nil {
-				t.history.override(string(t.input))
-				t.input = []rune(t.history.previous())
-				t.cx = len(t.input)
-			}
-		case actNextHistory:
-			if t.history != nil {
-				t.history.override(string(t.input))
-				t.input = []rune(t.history.next())
-				t.cx = len(t.input)
-			}
-		case actMouse:
-			me := event.MouseEvent
-			mx, my := me.X, me.Y
-			if me.S != 0 {
-				// Scroll
-				if t.merger.Length() > 0 {
-					if t.multi && me.Mod {
-						toggle()
-					}
-					t.vmove(me.S)
-					req(reqList)
-				}
-			} else if mx >= t.marginInt[3] && mx < C.MaxX()-t.marginInt[1] &&
-				my >= t.marginInt[0] && my < C.MaxY()-t.marginInt[2] {
-				mx -= t.marginInt[3]
-				my -= t.marginInt[0]
-				mx = util.Constrain(mx-len(t.prompt), 0, len(t.input))
-				if !t.reverse {
-					my = t.maxHeight() - my - 1
-				}
-				min := 2 + len(t.header)
-				if t.inlineInfo {
-					min--
-				}
-				if me.Double {
-					// Double-click
-					if my >= min {
-						if t.vset(t.offset+my-min) && t.cy < t.merger.Length() {
-							req(reqClose)
-						}
-					}
-				} else if me.Down {
-					if my == 0 && mx >= 0 {
-						// Prompt
-						t.cx = mx
-					} else if my >= min {
-						// List
-						if t.vset(t.offset+my-min) && t.multi && me.Mod {
-							toggle()
-						}
-						req(reqList)
-					}
-				}
-			}
 		}
 		changed := string(previousInput) != string(t.input)
 		t.mutex.Unlock() // Must be unlocked before touching reqBox

test/test_go.rb

@@ -8,7 +8,7 @@ DEFAULT_TIMEOUT = 20
 
 base = File.expand_path('../../', __FILE__)
 Dir.chdir base
-FZF = "#{base}/bin/fzf"
+FZF = "FZF_DEFAULT_OPTS= FZF_DEFAULT_COMMAND= #{base}/bin/fzf"
 
 class NilClass
   def include? str
@@ -213,7 +213,7 @@ class TestGoFZF < TestBase
   end
 
   def test_fzf_default_command
-    tmux.send_keys "FZF_DEFAULT_COMMAND='echo hello' #{fzf}", :Enter
+    tmux.send_keys fzf.sub('FZF_DEFAULT_COMMAND=', "FZF_DEFAULT_COMMAND='echo hello'"), :Enter
     tmux.until { |lines| lines.last =~ /^>/ }
 
     tmux.send_keys :Enter
@@ -904,6 +904,17 @@ class TestGoFZF < TestBase
     end
   end
 
+  def test_default_extended
+    assert_equal '100', `seq 100 | #{FZF} -f "1 00$"`.chomp
+    assert_equal '', `seq 100 | #{FZF} -f "1 00$" +x`.chomp
+  end
+
+  def test_exact
+    assert_equal 4, `seq 123 | #{FZF} -f 13`.lines.length
+    assert_equal 2, `seq 123 | #{FZF} -f 13 -e`.lines.length
+    assert_equal 4, `seq 123 | #{FZF} -f 13 +e`.lines.length
+  end
+
 private
   def writelines path, lines
     File.unlink path while File.exists? path