Update install script

Add --nth and --delimiter option

.gitignore

@@ -1,2 +1,3 @@
 pkg
 Gemfile.lock
+.DS_Store

README.md

@@ -27,23 +27,19 @@ git clone https://github.com/junegunn/fzf.git ~/.fzf
 The script will setup:
 
 - `fzf` executable
-- Key bindings (`CTRL-T`, `CTRL-R`, etc.)
+- Key bindings (`CTRL-T`, `CTRL-R`, and `ALT-C`) for bash and zsh
 - Fuzzy auto-completion for bash
 
 ### Install as Vim plugin
 
-You can use any Vim plugin manager to install fzf for Vim. If you don't use one,
-I recommend you try [vim-plug](https://github.com/junegunn/vim-plug).
+Once you have cloned the repository, add the following line to your .vimrc.
 
-1. [Install vim-plug](https://github.com/junegunn/vim-plug#usage)
-2. Edit your .vimrc
+```vim
+set rtp+=~/.fzf
+```
 
-        call plug#begin()
-        Plug 'junegunn/fzf'
-        " ...
-        call plug#end()
-
-3. Run `:PlugInstall`
+Or you may use any Vim plugin manager, such as
+[vim-plug](https://github.com/junegunn/vim-plug).
 
 Usage
 -----
@@ -54,12 +50,18 @@ usage: fzf [options]
   Options
     -m, --multi          Enable multi-select
     -x, --extended       Extended-search mode
+    -e, --extended-exact Extended-search mode (exact match)
     -q, --query=STR      Initial query
+    -f, --filter=STR     Filter mode. Do not start interactive finder.
+    -n, --nth=[-]N       Match only in the N-th token of the item
+    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
     -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
     +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
     -i                   Case-insensitive match (default: smart-case match)
     +i                   Case-sensitive match
     +c, --no-color       Disable colors
+    +2, --no-256         Disable 256-color
+        --black          Use black background
         --no-mouse       Disable mouse
 
   Environment variables
@@ -89,7 +91,7 @@ If you want to preserve the exact sequence of the input, provide `--no-sort` (or
 history | fzf +s
 ```
 
-### Key binding
+### Keys
 
 Use CTRL-J and CTRL-K (or CTRL-N and CTRL-P) to change the selection, press
 enter key to select the item. CTRL-C, CTRL-G, or ESC will terminate the finder.
@@ -98,14 +100,15 @@ The following readline key bindings should also work as expected.
 
 - CTRL-A / CTRL-E
 - CTRL-B / CTRL-F
-- CTRL-W / CTRL-U
+- CTRL-W / CTRL-U / CTRL-Y
 - ALT-B / ALT-F
 
 If you enable multi-select mode with `-m` option, you can select multiple items
 with TAB or Shift-TAB key.
 
-You can also use mouse. Click on an item to select it or shift-click to select
-multiple items. Use mouse wheel to move the cursor up and down.
+You can also use mouse. Double-click on an item to select it or shift-click (or
+ctrl-click) to select multiple items. Use mouse wheel to move the cursor up and
+down.
 
 ### Extended-search mode
 
@@ -123,23 +126,31 @@ such as: `^music .mp3$ sbtrkt !rmx`
 | `'wild`  | Items that include `wild`        | exact-match (quoted) |
 | `!'fire` | Items that do not include `fire` | inverse-exact-match  |
 
+If you don't need fuzzy matching and do not wish to "quote" every word, start
+fzf with `-e` or `--extended-exact` option.
+
 Useful examples
 ---------------
 
 ```sh
 # vimf - Open selected file in Vim
 vimf() {
-  FILE=$(fzf) && vim "$FILE"
+  local file
+  file=$(fzf --query="$1") && vim "$file"
 }
 
 # fd - cd to selected directory
 fd() {
-  DIR=$(find ${1:-*} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf) && cd "$DIR"
+  local dir
+  dir=$(find ${1:-*} -path '*/\.*' -prune \
+                  -o -type d -print 2> /dev/null | fzf +m) &&
+  cd "$dir"
 }
 
 # fda - including hidden directories
 fda() {
-  DIR=$(find ${1:-.} -type d 2> /dev/null | fzf) && cd "$DIR"
+  local dir
+  dir=$(find ${1:-.} -type d 2> /dev/null | fzf +m) && cd "$dir"
 }
 
 # fh - repeat history
@@ -151,6 +162,53 @@ fh() {
 fkill() {
   ps -ef | sed 1d | fzf -m | awk '{print $2}' | xargs kill -${1:-9}
 }
+
+# fbr - checkout git branch
+fbr() {
+  local branches branch
+  branches=$(git branch) &&
+  branch=$(echo "$branches" | fzf +s +m) &&
+  git checkout $(echo "$branch" | sed "s/.* //")
+}
+
+# fco - checkout git commit
+fco() {
+  local commits commit
+  commits=$(git log --pretty=oneline --abbrev-commit --reverse) &&
+  commit=$(echo "$commits" | fzf +s +m -e) &&
+  git checkout $(echo "$commit" | sed "s/ .*//")
+}
+
+# ftags - search ctags
+ftags() {
+  local line
+  [ -e tags ] &&
+    line=$(grep -v "^!" tags | cut -f1-3 | cut -c1-80 | fzf --nth=1) &&
+    $EDITOR $(cut -f2 <<< "$line")
+}
+
+# fq1 [QUERY]
+# - Immediately select the file when there's only one match.
+#   If not, start the fuzzy finder as usual.
+fq1() {
+  local lines
+  lines=$(fzf --filter="$1" --no-sort)
+  if [ -z "$lines" ]; then
+    return 1
+  elif [ $(wc -l <<< "$lines") -eq 1 ]; then
+    echo "$lines"
+  else
+    echo "$lines" | fzf --query="$1"
+  fi
+}
+
+# fe [QUERY]
+# - Open the selected file with the default editor
+#   (Bypass fuzzy finder when there's only one match)
+fe() {
+  local file
+  file=$(fq1 "$1") && ${EDITOR:-vim} "$file"
+}
 ```
 
 Key bindings for command line
@@ -158,20 +216,17 @@ Key bindings for command line
 
 The install script will setup the following key bindings.
 
-### bash
-
-- `CTRL-T` - Paste the selected file path(s) into the command line
-- `CTRL-R` - Paste the selected command from history into the command line
-
-The source code can be found in `~/.fzf.bash`.
-
-### zsh
+### bash/zsh
 
 - `CTRL-T` - Paste the selected file path(s) into the command line
 - `CTRL-R` - Paste the selected command from history into the command line
 - `ALT-C` - cd into the selected directory
 
-The source code can be found in `~/.fzf.zsh`.
+If you're on a tmux session, `CTRL-T` will launch fzf in a new split-window. You
+may disable this tmux integration by setting `FZF_TMUX` to 0, or change the
+height of the window with `FZF_TMUX_HEIGHT` (e.g. `20`, `50%`).
+
+The source code can be found in `~/.fzf.bash` and in `~/.fzf.zsh`.
 
 Auto-completion
 ---------------
@@ -249,7 +304,11 @@ TODO :smiley:
 Usage as Vim plugin
 -------------------
 
-If you install fzf as a Vim plugin, `:FZF` command will be added.
+(fzf is a command-line utility, naturally it is only accessible in terminal Vim)
+
+### `:FZF[!]`
+
+If you have set up fzf for Vim, `:FZF` command will be added.
 
 ```vim
 " Look for files under current directory
@@ -262,59 +321,101 @@ If you install fzf as a Vim plugin, `:FZF` command will be added.
 :FZF --no-sort -m /tmp
 ```
 
-You can override the source command which produces input to fzf.
+Note that the environment variables `FZF_DEFAULT_COMMAND` and `FZF_DEFAULT_OPTS`
+also apply here.
+
+If you're on a tmux session, `:FZF` will launch fzf in a new split-window whose
+height can be adjusted with `g:fzf_tmux_height` (default: '40%'). However, the
+bang version (`:FZF!`) will always start in fullscreen.
+
+### `fzf#run([options])`
+
+For more advanced uses, you can call `fzf#run()` function which returns the list
+of the selected items.
+
+`fzf#run()` may take an options-dictionary:
+
+| Option name | Type          | Description                                                         |
+| ----------- | ------------- | ------------------------------------------------------------------- |
+| `source`    | string        | External command to generate input to fzf (e.g. `find .`)           |
+| `source`    | list          | Vim list as input to fzf                                            |
+| `sink`      | string        | Vim command to handle the selected item (e.g. `e`, `tabe`)          |
+| `sink`      | funcref       | Reference to function to process each selected item                 |
+| `options`   | string        | Options to fzf                                                      |
+| `dir`       | string        | Working directory                                                   |
+| `tmux`      | number/string | Use tmux split if possible with the given height (e.g. `20`, `50%`) |
+
+#### Examples
+
+If `sink` option is not given, `fzf#run` will simply return the list.
 
 ```vim
-let g:fzf_source = 'find . -type f'
+let items = fzf#run({ 'options': '-m +c', 'dir': '~', 'source': 'ls' })
 ```
 
-And you can predefine default options to fzf command.
+But if `sink` is given as a string, the command will be executed for each
+selected item.
 
 ```vim
-let g:fzf_options = '--no-color --extended'
+" Each selected item will be opened in a new tab
+let items = fzf#run({ 'sink': 'tabe', 'options': '-m +c', 'dir': '~', 'source': 'ls' })
 ```
 
-For more advanced uses, you can call `fzf#run` function as follows.
+We can also use a Vim list as the source as follows:
 
 ```vim
-:call fzf#run('tabedit', '-m +c')
+" Choose a color scheme with fzf
+nnoremap <silent> <Leader>C :call fzf#run({
+\   'source':
+\     map(split(globpath(&rtp, "colors/*.vim"), "\n"),
+\         "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
+\   'sink':    'colo',
+\   'options': '+m',
+\   'tmux':    15
+\ })<CR>
 ```
 
-Most of the time, you will prefer native Vim plugins with better integration
-with Vim. The only reason one might consider using fzf in Vim is its speed. For
-a very large list of files, fzf is significantly faster and it does not block.
+`sink` option can be a function reference. The following example creates a
+handy mapping that selects an open buffer.
+
+```vim
+" List of buffers
+function! g:buflist()
+  redir => ls
+  silent ls
+  redir END
+  return split(ls, '\n')
+endfunction
+
+function! g:bufopen(e)
+  execute 'buffer '. matchstr(a:e, '^[ 0-9]*')
+endfunction
+
+nnoremap <silent> <Leader><Enter> :call fzf#run({
+\   'source':  g:buflist(),
+\   'sink':    function('g:bufopen'),
+\   'options': '+m +s',
+\   'tmux':    15
+\ })<CR>
+```
 
 Tips
 ----
 
-### Faster startup with `--disable-gems` options
+### Rendering issues
 
-If you're running Ruby 1.9 or above, you can improve the startup time with
-`--disable-gems` option to Ruby.
+If you have any rendering issues, check the followings:
 
-- `time ruby ~/bin/fzf -h`
-    - 0.077 sec
-- `time ruby --disable-gems ~/bin/fzf -h`
-    - 0.025 sec
-
-You can define fzf function with the option as follows:
-
-```sh
-fzf() {
-  ruby --disable-gems ~/bin/fzf "$@"
-}
-export -f fzf
-```
-
-However, this is automatically set up in your .bashrc and .zshrc if you use the
-bundled [install](https://github.com/junegunn/fzf/blob/master/install) script.
-
-### Incorrect display on Ruby 1.8
-
-It is reported that the output of fzf can become unreadable on some terminals
-when it's running on Ruby 1.8. If you experience the problem, upgrade your Ruby
-to 1.9 or above. Ruby 1.9 or above is also required for displaying Unicode
-characters.
+1. Make sure `$TERM` is correctly set. fzf will use 256-color only if it
+  contains `256` (e.g. `xterm-256color`)
+2. If you're on screen or tmux, `$TERM` should be either `screen` or
+  `screen-256color`
+3. Some terminal emulators (e.g. mintty) have problem displaying default
+  background color and make some text unable to read. In that case, try `--black`
+  option. And if it solves your problem, I recommend including it in
+  `FZF_DEFAULT_OPTS` for further convenience.
+4. If you still have problem, try `--no-256` option or even `--no-color`.
+5. Ruby 1.9 or above is required for correctly displaying unicode characters.
 
 ### Ranking algorithm
 

ext/mkrf_conf.rb

@@ -0,0 +1,9 @@
+require 'rubygems/dependency_installer'
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.1.0')
+  Gem::DependencyInstaller.new.install 'curses', '~> 1.0'
+end
+
+File.open(File.expand_path('../Rakefile', __FILE__), 'w') do |f|
+  f.puts 'task :default'
+end

fzf

@@ -7,13 +7,13 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/    Fuzzy finder for your shell
 #
-# Version: 0.7.1 (January 31, 2014)
+# Version: 0.8.2 (March 30, 2014)
 #
 # Author:  Junegunn Choi
 # URL:     https://github.com/junegunn/fzf
 # License: MIT
 #
-# Copyright (c) 2013 Junegunn Choi
+# Copyright (c) 2014 Junegunn Choi
 #
 # MIT License
 #
@@ -50,7 +50,8 @@ end
 
 class FZF
   C = Curses
-  attr_reader :rxflag, :sort, :color, :mouse, :multi, :query, :extended
+  attr_reader :rxflag, :sort, :nth, :color, :black, :ansi256,
+              :mouse, :multi, :query, :filter, :extended
 
   class AtomicVar
     def initialize value
@@ -63,10 +64,8 @@ class FZF
     end
 
     def set value = nil
-      if block_given?
-        @mutex.synchronize { @value = yield @value }
-      else
-        @mutex.synchronize { @value = value }
+      @mutex.synchronize do
+        @value = block_given? ? yield(@value) : value
       end
     end
 
@@ -79,9 +78,14 @@ class FZF
     @rxflag   = nil
     @sort     = ENV.fetch('FZF_DEFAULT_SORT', 1000).to_i
     @color    = true
+    @ansi256  = true
+    @black    = false
     @multi    = false
-    @extended = false
     @mouse    = true
+    @extended = nil
+    @filter   = nil
+    @nth      = nil
+    @delim    = nil
 
     argv =
       if opts = ENV['FZF_DEFAULT_OPTS']
@@ -96,12 +100,17 @@ class FZF
       when '-h', '--help'        then usage 0
       when '-m', '--multi'       then @multi    = true
       when '+m', '--no-multi'    then @multi    = false
-      when '-x', '--extended'    then @extended = true
-      when '+x', '--no-extended' then @extended = false
+      when '-x', '--extended'    then @extended = :fuzzy
+      when '+x', '--no-extended' then @extended = nil
       when '-i'                  then @rxflag   = Regexp::IGNORECASE
       when '+i'                  then @rxflag   = 0
       when '-c', '--color'       then @color    = true
       when '+c', '--no-color'    then @color    = false
+      when '-2', '--256'         then @ansi256  = true
+      when '+2', '--no-256'      then @ansi256  = false
+      when       '--black'       then @black    = true
+      when       '--no-black'    then @black    = false
+      when       '--mouse'       then @mouse    = true
       when       '--no-mouse'    then @mouse    = false
       when '+s', '--no-sort'     then @sort     = nil
       when '-q', '--query'
@@ -109,12 +118,30 @@ class FZF
         @query = AtomicVar.new query.dup
       when /^-q(.*)$/, /^--query=(.*)$/
         @query = AtomicVar.new($1)
+      when '-f', '--filter'
+        usage 1, 'query string required' unless query = argv.shift
+        @filter = query
+      when /^-f(.*)$/, /^--filter=(.*)$/
+        @filter = $1
+      when '-n', '--nth'
+        usage 1, 'field number required' unless nth = argv.shift
+        usage 1, 'invalid field number' if nth.to_i == 0
+        @nth = nth.to_i
+      when /^-n(-?[1-9][0-9]*)$/, /^--nth=(-?[1-9][0-9]*)$/
+        @nth = $1.to_i
+      when '-d', '--delimiter'
+        usage 1, 'delimiter required' unless delim = argv.shift
+        @delim = FZF.build_delim_regex delim
+      when /^-d(.+)$/, /^--delimiter=(.+)$/
+        @delim = FZF.build_delim_regex $1
       when '-s', '--sort'
         usage 1, 'sort size required' unless sort = argv.shift
         usage 1, 'invalid sort size'  unless sort =~ /^[0-9]+$/
         @sort = sort.to_i
       when /^-s([0-9]+)$/, /^--sort=([0-9]+)$/
         @sort = $1.to_i
+      when '-e', '--extended-exact'    then @extended = :exact
+      when '+e', '--no-extended-exact' then @extended = nil
       else
         usage 1, "illegal option: #{o}"
       end
@@ -126,6 +153,9 @@ class FZF
     @events   = {}
     @new      = []
     @queue    = Queue.new
+    @pending  = nil
+
+    unless @filter
       @query  ||= AtomicVar.new('')
       @cursor_x = AtomicVar.new(@query.length)
       @matches  = AtomicVar.new([])
@@ -135,19 +165,46 @@ class FZF
       @spinner  = AtomicVar.new('-\|/-\|/'.split(//))
       @selects  = AtomicVar.new({}) # ordered >= 1.9
       @main     = Thread.current
-    @stdout   = $stdout.clone
       @plcount  = 0
     end
+  end
+
+  def FZF.build_delim_regex delim
+    Regexp.compile(delim) rescue (delim = Regexp.escape(delim))
+    Regexp.compile "(?:.*?#{delim})|(?:.+?$)"
+  end
 
   def start
+    if @filter
+      start_reader(false).join
+      filter_list @new
+    else
+      @stdout = $stdout.clone
       $stdout.reopen($stderr)
 
-    render { init_screen }
-    start_reader
+      start_reader true
+      init_screen
       start_renderer
       start_search
       start_loop
     end
+  end
+
+  def filter_list list
+    matches = get_matcher.match(list, @filter, '', '')
+    if @sort && matches.length <= @sort
+      matches = sort_by_rank(matches)
+    end
+    matches.each { |m| puts m.first }
+  end
+
+  def get_matcher
+    if @extended
+      ExtendedFuzzyMatcher.new @rxflag, @extended, @nth, @delim
+    else
+      FuzzyMatcher.new @rxflag, @nth, @delim
+    end
+  end
 
   def version
     File.open(__FILE__, 'r') do |f|
@@ -167,12 +224,18 @@ class FZF
   Options
     -m, --multi          Enable multi-select
     -x, --extended       Extended-search mode
+    -e, --extended-exact Extended-search mode (exact match)
     -q, --query=STR      Initial query
+    -f, --filter=STR     Filter mode. Do not start interactive finder.
+    -n, --nth=[-]N       Match only in the N-th token of the item
+    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
     -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
     +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
     -i                   Case-insensitive match (default: smart-case match)
     +i                   Case-sensitive match
     +c, --no-color       Disable colors
+    +2, --no-256         Disable 256-color
+        --black          Use black background
         --no-mouse       Disable mouse
 
   Environment variables
@@ -429,7 +492,9 @@ class FZF
     }
   end
 
-  if RUBY_VERSION.split('.').map { |e| e.rjust(3, '0') }.join > '001009'
+  AFTER_1_9 = RUBY_VERSION.split('.').map { |e| e.rjust(3, '0') }.join >= '001009'
+
+  if AFTER_1_9
     @@wrx = Regexp.new '\p{Han}|\p{Katakana}|\p{Hiragana}|\p{Hangul}'
     def width str
       str.gsub(@@wrx, '  ').length rescue str.length
@@ -474,25 +539,20 @@ class FZF
 
   def init_screen
     C.init_screen
-    if @mouse
-      C.mouseinterval 0
-      C.mousemask C::ALL_MOUSE_EVENTS
-    end
-    C.stdscr.keypad(true)
+    C.mousemask C::ALL_MOUSE_EVENTS if @mouse
     C.start_color
     dbg =
-      if C.respond_to?(:use_default_colors)
+      if !@black && C.respond_to?(:use_default_colors)
         C.use_default_colors
         -1
       else
         C::COLOR_BLACK
       end
     C.raw
-    C.nonl
     C.noecho
 
     if @color
-      if C.can_change_color? && ENV['TERM'].to_s =~ /256/
+      if @ansi256 && ENV['TERM'].to_s =~ /256/
         C.init_pair 1, 110, dbg
         C.init_pair 2, 108, dbg
         C.init_pair 3, 254, 236
@@ -531,9 +591,11 @@ class FZF
         end | (bold ? C::A_BOLD : 0)
       end
     end
+
+    C.refresh
   end
 
-  def start_reader
+  def start_reader curses
     stream =
       if @source.tty?
         if default_command = ENV['FZF_DEFAULT_COMMAND']
@@ -544,7 +606,6 @@ class FZF
           exit 1
         end
       else
-        $stdin.reopen IO.open(IO.sysopen('/dev/tty'), 'r')
         @source
       end
 
@@ -553,12 +614,12 @@ class FZF
         emit(:new) { @new << line.chomp }
       end
       emit(:loaded) { true }
-      @spinner.clear
+      @spinner.clear if curses
     end
   end
 
   def start_search
-    matcher  = (@extended ? ExtendedFuzzyMatcher : FuzzyMatcher).new @rxflag
+    matcher  = get_matcher
     searcher = Thread.new {
       lists   = []
       events  = {}
@@ -618,12 +679,12 @@ class FZF
                              matcher.match(list, q, q[0, cx], q[cx..-1]))
               end
               next if skip
-              matches = fcache[q] = @sort ? found : found.reverse
-            end
-
+              matches = @sort ? found : found.reverse
               if !empty && @sort && matches.length <= @sort
                 matches = sort_by_rank(matches)
               end
+              fcache[q] = matches
+            end
 
             # Atomic update
             @matches.set matches
@@ -683,7 +744,6 @@ class FZF
   def start_renderer
     Thread.new do
       begin
-        refresh
         while blk = @queue.shift
           blk.call
           refresh
@@ -718,8 +778,148 @@ class FZF
     end
   end
 
-  def test_mouse st, *states
-    states.any? { |s| s & st > 0 }
+  def read_nb chars = 1, default = nil, tries = 10
+    tries.times do |_|
+      begin
+        return @tty.read_nonblock(chars).ord
+      rescue Exception
+        sleep 0.01
+      end
+    end
+    default
+  end
+
+  def read_nbs
+    ords = []
+    while ord = read_nb
+      ords << ord
+    end
+    ords
+  end
+
+  def get_mouse
+    case ord = read_nb
+    when 32, 36, 40, 48, # mouse-down / shift / cmd / ctrl
+         35, 39, 43, 51  # mouse-up / shift / cmd / ctrl
+      x = read_nb - 33
+      y = read_nb - 33
+      { :event => (ord % 2 == 0 ? :click : :release),
+        :x => x, :y => y, :shift => ord >= 36 }
+    when 96, 100, 104, 112, # scroll-up / shift / cmd / ctrl
+         97, 101, 105, 113  # scroll-down / shift / cmd / ctrl
+      read_nb(2)
+      { :event => :scroll, :diff => (ord % 2 == 0 ? -1 : 1), :shift => ord >= 100 }
+    else
+      # e.g. 40, 43, 104, 105
+      read_nb(2)
+      nil
+    end
+  end
+
+  def get_input actions
+    @tty ||= IO.open(IO.sysopen('/dev/tty'), 'r')
+
+    if pending = @pending
+      @pending = nil
+      return pending
+    end
+
+    str = ''
+    while true
+      ord =
+        if str.empty?
+          @tty.getc.ord
+        else
+          begin
+            ord = @tty.read_nonblock(1).ord
+            if (nb = num_unicode_bytes(ord)) > 1
+              ords = [ord]
+              (nb - 1).times do |_|
+                ords << @tty.read_nonblock(1).ord
+              end
+              # UTF-8 TODO Ruby 1.8
+              ords.pack('C*').force_encoding('UTF-8')
+            else
+              ord
+            end
+          rescue Exception
+            return str
+          end
+        end
+
+      ord =
+        case read_nb(1, :esc)
+        when 91
+          case read_nb(1, nil)
+          when 68 then ctrl(:b)
+          when 67 then ctrl(:f)
+          when 66 then ctrl(:j)
+          when 65 then ctrl(:k)
+          when 90 then :stab
+          when 50 then read_nb; :ins
+          when 51 then read_nb; :del
+          when 53 then read_nb; :pgup
+          when 54 then read_nb; :pgdn
+          when 49
+            case read_nbs
+            when [59, 50, 68] then ctrl(:a)
+            when [59, 50, 67] then ctrl(:e)
+            when [126]        then ctrl(:a)
+            end
+          when 52 then read_nb; ctrl(:e)
+          when 72 then ctrl(:a)
+          when 70 then ctrl(:e)
+          when 77
+            get_mouse
+          end
+        when 'b',  98 then :alt_b
+        when 'f', 102 then :alt_f
+        when :esc     then :esc
+        else          next
+        end if ord == 27
+
+      return ord if ord.nil? || ord.is_a?(Hash)
+
+      if actions.has_key?(ord)
+        if str.empty?
+          return ord
+        else
+          @pending = ord
+          return str
+        end
+      else
+        unless ord.is_a? String
+          ord = [ord].pack('U*')
+        end
+        str << ord if ord =~ /[[:print:]]/
+      end
+    end
+  end
+
+  class MouseEvent
+    DOUBLE_CLICK_INTERVAL = 0.5
+
+    attr_reader :v
+
+    def initialize v = nil
+      @c = 0
+      @v = v
+      @t = Time.at 0
+    end
+
+    def v= v
+      @c = (@v == v && within?) ? @c + 1 : 0
+      @v = v
+      @t = Time.now
+    end
+
+    def double? v
+      @c == 1 && @v == v && within?
+    end
+
+    def within?
+      (Time.now - @t) < DOUBLE_CLICK_INTERVAL
+    end
   end
 
   def start_loop
@@ -727,6 +927,8 @@ class FZF
     begin
       input = @query.get.dup
       cursor = input.length
+      yanked = ''
+      mouse_event = MouseEvent.new
       backword = proc {
         cursor = (input[0, cursor].rindex(/\s\S/) || -1) + 1
       }
@@ -737,7 +939,11 @@ class FZF
           got = pick
           exit 0
         },
-        ctrl(:u) => proc { input = input[cursor..-1]; cursor = 0 },
+        ctrl(:u) => proc {
+          yanked = input[0...cursor] if cursor > 0
+          input = input[cursor..-1]
+          cursor = 0
+        },
         ctrl(:a) => proc { cursor = 0; nil },
         ctrl(:e) => proc { cursor = input.length; nil },
         ctrl(:j) => proc { vselect { |v| v - 1 } },
@@ -745,8 +951,10 @@ class FZF
         ctrl(:w) => proc {
           pcursor = cursor
           backword.call
+          yanked = input[cursor...pcursor] if pcursor > cursor
           input = input[0...cursor] + input[pcursor..-1]
         },
+        ctrl(:y) => proc { actions[:default].call yanked },
         ctrl(:h) => proc { input[cursor -= 1] = '' if cursor > 0 },
         ctrl(:i) => proc { |o|
           if @multi && sel = pick
@@ -755,104 +963,76 @@ class FZF
             else
               @selects[sel] = 1
             end
-            vselect { |v|
-              v + case o
-                  when :select     then 0
-                  when C::KEY_BTAB then 1
+            vselect { |v| v + case o
+                              when :stab then 1
+                              when :sclick then 0
                               else -1
-                  end
-            }
+                              end }
           end
         },
         ctrl(:b) => proc { cursor = [0, cursor - 1].max; nil },
         ctrl(:f) => proc { cursor = [input.length, cursor + 1].min; nil },
+        ctrl(:l) => proc { render { C.clear; C.refresh }; update_list true },
+        :del   => proc { input[cursor] = '' if input.length > cursor },
+        :pgup  => proc { vselect { |_| max_items } },
+        :pgdn  => proc { vselect { |_| 0 } },
         :alt_b => proc { backword.call; nil },
         :alt_f => proc {
           cursor += (input[cursor..-1].index(/(\S\s)|(.$)/) || -1) + 1
           nil
         },
+        :default => proc { |val|
+          case val
+          when String
+            input.insert cursor, val
+            cursor += val.length
+          when Hash
+            event = val[:event]
+            case event
+            when :click, :release
+              x, y, shift = val.values_at :x, :y, :shift
+              if y == cursor_y
+                cursor = [0, [input.length, x - 2].min].max
+              elsif x > 1 && y <= max_items
+                tv = max_items - y - 1
+
+                case event
+                when :click
+                  vselect { |_| tv }
+                  actions[ctrl(:i)].call(:sclick) if shift
+                  mouse_event.v = tv
+                when :release
+                  if !shift && mouse_event.double?(tv)
+                    actions[ctrl(:m)].call
+                  end
+                end
+              end
+            when :scroll
+              diff, shift = val.values_at :diff, :shift
+              actions[ctrl(:i)].call(:sclick) if shift
+              actions[ctrl(diff > 0 ? :j : :k)].call
+            end
+          end
         }
-      actions[C::KEY_UP]        = actions[ctrl(:p)] = actions[ctrl(:k)]
-      actions[C::KEY_DOWN]      = actions[ctrl(:n)] = actions[ctrl(:j)]
-      actions[C::KEY_LEFT]      = actions[ctrl(:b)]
-      actions[C::KEY_RIGHT]     = actions[ctrl(:f)]
-      actions[C::KEY_BTAB]      = actions[:select]  = actions[ctrl(:i)]
-      actions[C::KEY_BACKSPACE] = actions[127]      = actions[ctrl(:h)]
+      }
+      actions[ctrl(:p)] = actions[ctrl(:k)]
+      actions[ctrl(:n)] = actions[ctrl(:j)]
+      actions[:stab]    = actions[ctrl(:i)]
+      actions[127]      = actions[ctrl(:h)]
       actions[ctrl(:q)] = actions[ctrl(:g)] = actions[ctrl(:c)] = actions[:esc]
 
       emit(:key) { [@query.get, cursor] } unless @query.empty?
-      pmv = nil
       while true
         @cursor_x.set cursor
         render { print_input }
 
-        C.stdscr.timeout = -1
-        ch = C.getch
-
-        case ch
-        when C::KEY_MOUSE
-          if m = C.getmouse
-            st = m.bstate
-            if test_mouse(st, C::BUTTON1_PRESSED, C::BUTTON1_RELEASED)
-              if m.y == cursor_y
-                # TODO Wide-characters
-                cursor = [0, [input.length, m.x - 2].min].max
-              elsif m.x > 1 && m.y <= max_items
-                vselect { |v|
-                  tv = max_items - m.y - 1
-                  if test_mouse(st, C::BUTTON1_RELEASED)
-                    if test_mouse(st, C::BUTTON_SHIFT)
-                      ch = :select
-                    elsif pmv == tv
-                      ch = ctrl(:m)
-                    end
-                    pmv = tv
-                  end
-                  tv
-                }
-              end
-            elsif test_mouse(st, 0x8000000, C::BUTTON2_PRESSED)
-              ch = C::KEY_DOWN
-            elsif test_mouse(st, C::BUTTON4_PRESSED)
-              ch = C::KEY_UP
-            end
-          end
-        when 27
-          C.stdscr.timeout = 0
-          ch =
-            case ch2 = C.getch
-            when 'b' then :alt_b
-            when 'f' then :alt_f
-            when nil then :esc
-            else
-              ch2
-            end
-        end
-
-        upd = actions.fetch(ch, proc { |ch|
-          if ch.is_a?(Fixnum)
-            # Ruby 1.8
-            if (ch.chr rescue '') =~ /[[:print:]]/
-              ch = ch.chr
-            elsif (nch = num_unicode_bytes(ch)) > 1
-              chs = [ch]
-              (nch - 1).times do |i|
-                chs << C.getch
-              end
-              # UTF-8 TODO Ruby 1.8
-              ch = chs.pack('C*').force_encoding('UTF-8')
-            end
-          end
-
-          if ch.is_a?(String) && ch =~ /[[:print:]]/
-            input.insert cursor, ch
-            cursor += 1
-          end
-        }).call(ch)
+        if key = get_input(actions)
+          upd = actions.fetch(key, actions[:default]).call(key)
 
           # Dispatch key event
           emit(:key) { [@query.set(input.dup), cursor] } if upd
         end
+      end
     ensure
       C.close_screen
       if got
@@ -867,10 +1047,55 @@ class FZF
     end
   end
 
+  class Matcher
+    class MatchData
+      def initialize n
+        @n = n
+      end
+
+      def offset _
+        @n
+      end
+    end
+
+    def initialize nth, delim
+      @nth = nth && (nth > 0 ? nth - 1 : nth)
+      @delim = delim
+      @tokens_cache = {}
+    end
+
+    def tokenize str
+      @tokens_cache[str] ||=
+        unless @delim
+          # AWK default
+          prefix_length = str[/^\s+/].length rescue 0
+          [prefix_length, (str.strip.scan(/\S+\s*/) rescue [])]
+        else
+          prefix_length = 0
+          [prefix_length, (str.scan(@delim) rescue [])]
+        end
+    end
+
+    def do_match str, pat
+      if @nth
+        prefix_length, tokens = tokenize str
+
+        if (token = tokens[@nth]) && (md = token.match(pat) rescue nil)
+          prefix_length += (tokens[0...@nth] || []).join.length
+          offset = md.offset(0).map { |o| o + prefix_length }
+          MatchData.new offset
+        end
+      else
+        str.match(pat) rescue nil
+      end
+    end
+  end
+
   class FuzzyMatcher < Matcher
     attr_reader :caches, :rxflag
 
-    def initialize rxflag
+    def initialize rxflag, nth = nil, delim = nil
+      super nth, delim
       @caches = Hash.new { |h, k| h[k] = {} }
       @regexp = {}
       @rxflag = rxflag
@@ -914,16 +1139,17 @@ class FZF
       cache[q] ||= (partial_cache ?
                     partial_cache.map { |e| e.first } : list).map { |line|
         # Ignore errors: e.g. invalid byte sequence in UTF-8
-        md = line.match(regexp) rescue nil
+        md = do_match(line, regexp)
         md && [line, [md.offset(0)]]
       }.compact
     end
   end
 
   class ExtendedFuzzyMatcher < FuzzyMatcher
-    def initialize rxflag
-      super
+    def initialize rxflag, mode = :fuzzy, nth = nil, delim = nil
+      super rxflag, nth, delim
       @regexps = {}
+      @mode = mode
     end
 
     def empty? q
@@ -946,8 +1172,11 @@ class FZF
             when /^\^(.*)\$$/
               Regexp.new('^' << sanitize(Regexp.escape($1)) << '$', rxflag_for(w))
             when /^'/
-              w.length > 1 ?
-                Regexp.new(sanitize(Regexp.escape(w[1..-1])), rxflag_for(w)) : nil
+              if @mode == :fuzzy && w.length > 1
+                exact_regex w[1..-1]
+              elsif @mode == :exact
+                exact_regex w
+              end
             when /^\^/
               w.length > 1 ?
                 Regexp.new('^' << sanitize(Regexp.escape(w[1..-1])), rxflag_for(w)) : nil
@@ -955,11 +1184,15 @@ class FZF
               w.length > 1 ?
                 Regexp.new(sanitize(Regexp.escape(w[0..-2])) << '$', rxflag_for(w)) : nil
             else
-              fuzzy_regex w
+              @mode == :fuzzy ? fuzzy_regex(w) : exact_regex(w)
             end, invert ]
       }.select { |pair| pair.first }
     end
 
+    def exact_regex w
+      Regexp.new(sanitize(Regexp.escape(w)), rxflag_for(w))
+    end
+
     def match list, q, prefix, suffix
       regexps = parse q
       # Look for prefix cache
@@ -976,7 +1209,7 @@ class FZF
         offsets = []
         regexps.all? { |pair|
           regexp, invert = pair
-          md = line.match(regexp) rescue nil
+          md = do_match(line, regexp)
           if md && !invert
             offsets << md.offset(0)
           elsif !md && invert

fzf.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fzf'
-  spec.version       = '0.7.1'
+  spec.version       = '0.8.2'
   spec.authors       = ['Junegunn Choi']
   spec.email         = ['junegunn.c@gmail.com']
   spec.description   = %q{Fuzzy finder for your shell}
@@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
   spec.files         = %w[fzf.gemspec]
   spec.executables   = 'fzf'
 
-  spec.add_runtime_dependency 'curses', '~> 1.0.0'
+  spec.extensions   += ['ext/mkrf_conf.rb']
 end

install

@@ -29,10 +29,13 @@ if [ $? -eq 0 ]; then
 else
   echo "Not found"
   echo "Installing 'curses' gem ... "
-  /usr/bin/env gem install curses
+  /usr/bin/env gem install curses -v 1.0.0 --user-install
   if [ $? -ne 0 ]; then
+    echo
     echo "Failed to install 'curses' gem."
-    echo "Try installing it as root: sudo gem install curses"
+    if [[ $(uname -r) =~ 'ARCH' ]]; then
+      echo "Make sure that base-devel package group is installed."
+    fi
     exit 1
   fi
 fi
@@ -92,45 +95,115 @@ EOF
 
   if [ $key_bindings -eq 0 ]; then
     if [ $shell = bash ]; then
-      cat >> $src << "EOF"
+      cat >> $src << "EOFZF"
 # Key bindings
 # ------------
-# Required to refresh the prompt after fzf
-bind '"\er": redraw-current-line'
+if [[ $- =~ i ]]; then
 
-# CTRL-T - Paste the selected file path into the command line
-__fsel() {
+read -r -d '' __fsel <<'EOF'
   find * -path '*/\.*' -prune \
     -o -type f -print \
+    -o -type d -print \
     -o -type l -print 2> /dev/null | fzf -m | while read item; do
     printf '%q ' "$item"
   done
   echo
+EOF
+
+__fsel() {
+  eval "$__fsel"
 }
+
+__fsel_tmux() {
+  local height lines
+  height=${FZF_TMUX_HEIGHT:-40%}
+  lines=${LINES:-40}
+  if [[ $height =~ %$ ]]; then
+    height=${height:0:${#height}-1}
+    height=$(( height * lines / 100 ))
+  fi
+  tmux split-window -l $height "tmux send-keys -t $TMUX_PANE \"\$($__fsel)\""
+}
+
+__fcd() {
+  local dir
+  dir=$(find ${1:-*} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m) && printf 'cd %q' "$dir"
+}
+
+__use_tmux=0
+[ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ] && __use_tmux=1
+
+if [ -z "$(set -o | grep '^vi.*on')" ]; then
+  # Required to refresh the prompt after fzf
+  bind '"\er": redraw-current-line'
+
+  # CTRL-T - Paste the selected file path into the command line
+  if [ $__use_tmux -eq 1 ]; then
+    bind '"\C-t": " \C-u \C-a\C-k$(__fsel_tmux)\e\C-e\C-y\C-a\C-d\C-y\ey\C-h"'
+  else
     bind '"\C-t": " \C-u \C-a\C-k$(__fsel)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'
+  fi
 
   # CTRL-R - Paste the selected command from history into the command line
-bind '"\C-r": " \C-e\C-u$(history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
+  bind '"\C-r": " \C-e\C-u$(HISTTIMEFORMAT= history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
 
-EOF
+  # ALT-C - cd into the selected directory
+  bind '"\ec": " \C-e\C-u$(__fcd)\e\C-e\er\C-m"'
 else
-      cat >> $src << "EOF"
+  bind '"\C-x\C-e": shell-expand-line'
+  bind '"\C-x\C-r": redraw-current-line'
+
+  # CTRL-T - Paste the selected file path into the command line
+  # - FIXME: Selected items are attached to the end regardless of cursor position
+  if [ $__use_tmux -eq 1 ]; then
+    bind '"\C-t": "\e$a \eddi$(__fsel_tmux)\C-x\C-e\e0P$xa"'
+  else
+    bind '"\C-t": "\e$a \eddi$(__fsel)\C-x\C-e\e0Px$a \C-x\C-r"'
+  fi
+
+  # CTRL-R - Paste the selected command from history into the command line
+  bind '"\C-r": "\eddi$(HISTTIMEFORMAT= history | fzf +s | sed \"s/ *[0-9]* *//\")\C-x\C-e\e$a\C-x\C-r"'
+
+  # ALT-C - cd into the selected directory
+  bind '"\ec": "\eddi$(__fcd)\C-x\C-e\C-x\C-r\C-m"'
+fi
+
+unset __use_tmux
+
+fi
+EOFZF
+    else
+      cat >> $src << "EOFZF"
 # Key bindings
 # ------------
 # CTRL-T - Paste the selected file path(s) into the command line
-fzf-file-widget() {
-  local FILES
-  local IFS="
-"
-  FILES=($(
+read -r -d '' __fsel <<'EOF'
   find * -path '*/\.*' -prune \
     -o -type f -print \
-    -o -type l -print 2> /dev/null | fzf -m))
-  unset IFS
-  FILES=$FILES:q
-  LBUFFER="${LBUFFER%% #} $FILES"
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | fzf -m | while read item; do
+    printf '%q ' "$item"
+  done
+  echo
+EOF
+
+if [ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ]; then
+  fzf-file-widget() {
+    local height lines
+    height=${FZF_TMUX_HEIGHT:-40%}
+    lines=${LINES:-40}
+    if [[ $height =~ %$ ]]; then
+      height=${height:0:${#height}-1}
+      height=$(( height * lines / 100 ))
+    fi
+    tmux split-window -l $height "tmux send-keys -t $TMUX_PANE \"\$($__fsel)\""
+  }
+else
+  fzf-file-widget() {
+    LBUFFER="${LBUFFER%% #}$(eval "$__fsel")"
     zle redisplay
   }
+fi
 zle     -N   fzf-file-widget
 bindkey '^T' fzf-file-widget
 
@@ -145,13 +218,13 @@ bindkey '\ec' fzf-cd-widget
 
 # CTRL-R - Paste the selected command from history into the command line
 fzf-history-widget() {
-  LBUFFER=$(history | fzf +s | sed "s/ *[0-9]* *//")
+  LBUFFER=$(fc -l 1 | fzf +s | sed "s/ *[0-9]* *//")
   zle redisplay
 }
 zle     -N   fzf-history-widget
 bindkey '^R' fzf-history-widget
 
-EOF
+EOFZF
     fi
   fi
 
@@ -165,8 +238,9 @@ for shell in bash zsh; do
 
   echo "Update $rc:"
   echo "  - $src"
-  if [ $(grep -F "$src" $rc | wc -l) -gt 0 ]; then
-    echo "    - Not added (already being sourced)"
+  line=$(grep -nF "$src" $rc | sed 's/:.*//')
+  if [ -n "$line" ]; then
+    echo "    - Already exists (line #$line)"
   else
     echo $src >> $rc
     echo "    - Added"
@@ -180,5 +254,7 @@ Finished. Reload your .bashrc or .zshrc.
    source ~/.zshrc   # zsh
 
 To uninstall fzf, simply remove the added line.
+
+For more information, see: https://github.com/junegunn/fzf
 EOF
 

plugin/fzf.vim

@@ -1,4 +1,4 @@
-" Copyright (c) 2013 Junegunn Choi
+" Copyright (c) 2014 Junegunn Choi
 "
 " MIT License
 "
@@ -21,39 +21,178 @@
 " OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 " WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-let s:exec = expand('<sfile>:h:h').'/fzf'
+let s:min_tmux_height = 3
+let s:default_tmux_height = '40%'
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+call system('type fzf')
+if v:shell_error
+  let s:fzf_rb = expand('<sfile>:h:h').'/fzf'
+  if executable(s:fzf_rb)
+    let s:exec = s:fzf_rb
+  else
+    echoerr 'fzf executable not found'
+    finish
+  endif
+else
+  let s:exec = 'fzf'
+endif
+
+function! s:shellesc(arg)
+  return '"'.substitute(a:arg, '"', '\\"', 'g').'"'
+endfunction
 
 function! s:escape(path)
   return substitute(a:path, ' ', '\\ ', 'g')
 endfunction
 
-function! fzf#run(command, ...)
-  let cwd = getcwd()
-  try
-    let args = copy(a:000)
-    if len(args) > 0 && isdirectory(expand(args[-1]))
-      let dir = remove(args, -1)
-      execute 'chdir '.s:escape(dir)
+function! fzf#run(...) abort
+  if has('gui_running')
+    echohl Error
+    echo 'GVim is not supported'
+    return []
   endif
-    let argstr  = join(args)
-    let tf      = tempname()
-    let prefix  = exists('g:fzf_source') ? g:fzf_source.'|' : ''
-    let fzf     = executable(s:exec)     ? s:exec : 'fzf'
-    let options = empty(argstr)          ? get(g:, 'fzf_options', '') : argstr
-    execute "silent !".prefix.fzf.' '.options." > ".tf
-    if !v:shell_error
-      for line in readfile(tf)
-        if !empty(line)
-          execute a:command.' '.s:escape(line)
+  let dict   = exists('a:1') ? a:1 : {}
+  let temps  = { 'result': tempname() }
+  let optstr = get(dict, 'options', '')
+
+  if has_key(dict, 'source')
+    let source = dict.source
+    let type = type(source)
+    if type == 1
+      let prefix = source.'|'
+    elseif type == 3
+      let temps.input = tempname()
+      call writefile(source, temps.input)
+      let prefix = 'cat '.s:shellesc(temps.input).'|'
+    else
+      throw 'Invalid source type'
+    endif
+  else
+    let prefix = ''
+  endif
+  let command = prefix.s:exec.' '.optstr.' > '.temps.result
+
+  if exists('$TMUX') && has_key(dict, 'tmux') &&
+        \ dict.tmux > 0 && winheight(0) >= s:min_tmux_height
+    return s:execute_tmux(dict, command, temps)
+  else
+    return s:execute(dict, command, temps)
+  endif
+endfunction
+
+function! s:pushd(dict)
+  if has_key(a:dict, 'dir')
+    let a:dict.prev_dir = getcwd()
+    execute 'chdir '.s:escape(a:dict.dir)
+  endif
+endfunction
+
+function! s:popd(dict)
+  if has_key(a:dict, 'prev_dir')
+    execute 'chdir '.s:escape(remove(a:dict, 'prev_dir'))
+  endif
+endfunction
+
+function! s:execute(dict, command, temps)
+  call s:pushd(a:dict)
+  silent !clear
+  execute 'silent !'.a:command
+  redraw!
+  if v:shell_error
+    return []
+  else
+    return s:callback(a:dict, a:temps, 0)
+  endif
+endfunction
+
+function! s:execute_tmux(dict, command, temps)
+  if has_key(a:dict, 'dir')
+    let command = 'cd '.s:escape(a:dict.dir).' && '.a:command
+  else
+    let command = a:command
+  endif
+
+  if type(a:dict.tmux) == 1
+    if a:dict.tmux =~ '%$'
+      let height = screenrow() * str2nr(a:dict.tmux[0:-2]) / 100
+    else
+      let height = str2nr(a:dict.tmux)
+    endif
+  else
+    let height = a:dict.tmux
+  endif
+
+  let s:pane = substitute(
+    \ system(
+      \ printf(
+        \ 'tmux split-window -l %d -P -F "#{pane_id}" %s',
+        \ height, s:shellesc(command))), '\n', '', 'g')
+  let s:dict = a:dict
+  let s:temps = a:temps
+
+  augroup fzf_tmux
+    autocmd!
+    autocmd VimResized * nested call s:tmux_check()
+  augroup END
+endfunction
+
+function! s:tmux_check()
+  let panes = split(system('tmux list-panes -a -F "#{pane_id}"'), '\n')
+
+  if index(panes, s:pane) < 0
+    augroup fzf_tmux
+      autocmd!
+    augroup END
+
+    call s:callback(s:dict, s:temps, 1)
+    redraw
+  endif
+endfunction
+
+function! s:callback(dict, temps, cd)
+  if !filereadable(a:temps.result)
+    let lines = []
+  else
+    if a:cd | call s:pushd(a:dict) | endif
+
+    let lines = readfile(a:temps.result)
+    if has_key(a:dict, 'sink')
+      for line in lines
+        if type(a:dict.sink) == 2
+          call a:dict.sink(line)
+        else
+          execute a:dict.sink.' '.s:escape(line)
         endif
       endfor
     endif
-  finally
-    execute 'chdir '.s:escape(cwd)
-    redraw!
+  endif
+
+  for tf in values(a:temps)
     silent! call delete(tf)
-  endtry
+  endfor
+
+  call s:popd(a:dict)
+
+  return lines
 endfunction
 
-command! -nargs=* -complete=dir FZF call fzf#run('silent e', <f-args>)
+function! s:cmd(bang, ...) abort
+  let args = copy(a:000)
+  let opts = {}
+  if len(args) > 0 && isdirectory(expand(args[-1]))
+    let opts.dir = remove(args, -1)
+  endif
+  if !a:bang
+    let opts.tmux = get(g:, 'fzf_tmux_height', s:default_tmux_height)
+  endif
+  call fzf#run(extend({ 'sink': 'e', 'options': join(args) }, opts))
+endfunction
+
+command! -nargs=* -complete=dir -bang FZF call s:cmd('<bang>' == '!', <f-args>)
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
 

test/fzf.vader

@@ -0,0 +1,37 @@
+Execute (Setup):
+  let g:dir = fnamemodify(g:vader_file, ':p:h')
+  Log 'Test directory: ' . g:dir
+
+Execute (fzf#run with dir option):
+  let result = fzf#run({ 'options': '--filter=vdr', 'dir': g:dir })
+  AssertEqual ['fzf.vader'], result
+
+  let result = sort(fzf#run({ 'options': '--filter e', 'dir': g:dir }))
+  AssertEqual ['fzf.vader', 'test_fzf.rb'], result
+
+Execute (fzf#run with Funcref command):
+  let g:ret = []
+  function! g:proc(e)
+    call add(g:ret, a:e)
+  endfunction
+  let result = sort(fzf#run({ 'sink': function('g:proc'), 'options': '--filter e', 'dir': g:dir }))
+  AssertEqual ['fzf.vader', 'test_fzf.rb'], result
+  AssertEqual ['fzf.vader', 'test_fzf.rb'], sort(g:ret)
+
+Execute (fzf#run with string source):
+  let result = sort(fzf#run({ 'source': 'echo hi', 'options': '-f i' }))
+  AssertEqual ['hi'], result
+
+Execute (fzf#run with list source):
+  let result = sort(fzf#run({ 'source': ['hello', 'world'], 'options': '-f e' }))
+  AssertEqual ['hello'], result
+  let result = sort(fzf#run({ 'source': ['hello', 'world'], 'options': '-f o' }))
+  AssertEqual ['hello', 'world'], result
+
+Execute (fzf#run with string source):
+  let result = sort(fzf#run({ 'source': 'echo hi', 'options': '-f i' }))
+  AssertEqual ['hi'], result
+
+Execute (Cleanup):
+  unlet g:dir
+  Restore

test/test_fzf.rb

@@ -7,7 +7,6 @@ ENV['FZF_EXECUTABLE'] = '0'
 load 'fzf'
 
 class TestFZF < MiniTest::Unit::TestCase
-
   def setup
     ENV.delete 'FZF_DEFAULT_SORT'
     ENV.delete 'FZF_DEFAULT_OPTS'
@@ -28,57 +27,81 @@ class TestFZF < MiniTest::Unit::TestCase
     ENV['FZF_DEFAULT_SORT'] = '20000'
     fzf = FZF.new []
     assert_equal 20000, fzf.sort
+    assert_equal nil,   fzf.nth
 
-    ENV['FZF_DEFAULT_OPTS'] = '-x -m -s 10000 -q "  hello  world  " +c --no-mouse'
+    ENV['FZF_DEFAULT_OPTS'] =
+      '-x -m -s 10000 -q "  hello  world  " +c +2 --no-mouse -f "goodbye world" --black --nth=3'
     fzf = FZF.new []
     assert_equal 10000,   fzf.sort
     assert_equal '  hello  world  ',
                           fzf.query.get
-    assert_equal true,    fzf.extended
+    assert_equal 'goodbye world',
+                          fzf.filter
+    assert_equal :fuzzy,  fzf.extended
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
+    assert_equal false,   fzf.ansi256
+    assert_equal true,    fzf.black
     assert_equal false,   fzf.mouse
+    assert_equal 3,       fzf.nth
   end
 
   def test_option_parser
     # Long opts
-    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello --extended --no-mouse]
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello
+                     --filter=howdy --extended-exact --no-mouse --no-256 --nth=1]
     assert_equal 2000,    fzf.sort
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
+    assert_equal false,   fzf.ansi256
+    assert_equal false,   fzf.black
     assert_equal false,   fzf.mouse
     assert_equal 0,       fzf.rxflag
     assert_equal 'hello', fzf.query.get
-    assert_equal true,    fzf.extended
+    assert_equal 'howdy', fzf.filter
+    assert_equal :exact,  fzf.extended
+    assert_equal 1,       fzf.nth
 
     fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello
-                     --no-sort -i --color --no-multi]
+                     --filter a --filter b --no-256 --black --nth 2
+                     --no-sort -i --color --no-multi --256]
     assert_equal nil,     fzf.sort
     assert_equal false,   fzf.multi
     assert_equal true,    fzf.color
+    assert_equal true,    fzf.ansi256
+    assert_equal true,    fzf.black
     assert_equal true,    fzf.mouse
     assert_equal 1,       fzf.rxflag
+    assert_equal 'b',     fzf.filter
     assert_equal 'hello', fzf.query.get
-    assert_equal false,   fzf.extended
+    assert_equal nil,     fzf.extended
+    assert_equal 2,       fzf.nth
 
     # Short opts
-    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x]
+    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x -fhowdy +2 -n3]
     assert_equal 2000,    fzf.sort
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
+    assert_equal false,   fzf.ansi256
     assert_equal 0,       fzf.rxflag
     assert_equal 'hello', fzf.query.get
-    assert_equal true,    fzf.extended
+    assert_equal 'howdy', fzf.filter
+    assert_equal :fuzzy,  fzf.extended
+    assert_equal 3,       fzf.nth
 
     # Left-to-right
-    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x
-                     -s 3000 -c +m -i -q world +x]
+    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x -fgoodbye +2 -n3 -n4
+                     -s 3000 -c +m -i -q world +x -fworld -2 --black --no-black]
     assert_equal 3000,    fzf.sort
     assert_equal false,   fzf.multi
     assert_equal true,    fzf.color
+    assert_equal true,    fzf.ansi256
+    assert_equal false,   fzf.black
     assert_equal 1,       fzf.rxflag
     assert_equal 'world', fzf.query.get
-    assert_equal false,   fzf.extended
+    assert_equal 'world', fzf.filter
+    assert_equal nil,     fzf.extended
+    assert_equal 4,       fzf.nth
 
     fzf = FZF.new %w[--query hello +s -s 2000 --query=world]
     assert_equal 2000,    fzf.sort
@@ -93,6 +116,12 @@ class TestFZF < MiniTest::Unit::TestCase
         fzf = FZF.new argv
       end
     end
+    assert_raises(SystemExit) do
+      fzf = FZF.new %w[--nth=0]
+    end
+    assert_raises(SystemExit) do
+      fzf = FZF.new %w[-n 0]
+    end
   end
 
   # FIXME Only on 1.9 or above
@@ -370,6 +399,25 @@ class TestFZF < MiniTest::Unit::TestCase
       FZF.new([]).sort_by_rank(xmatcher.match(list, '01 __', '', '')))
   end
 
+  def test_extended_exact_mode
+    exact = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :exact
+    fuzzy = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :fuzzy
+    list = %w[
+      extended-exact-mode-not-fuzzy
+      extended'-fuzzy-mode
+    ]
+    assert_equal 2, fuzzy.match(list, 'extended', '', '').length
+    assert_equal 2, fuzzy.match(list, 'mode extended', '', '').length
+    assert_equal 2, fuzzy.match(list, 'xtndd', '', '').length
+    assert_equal 2, fuzzy.match(list, "'-fuzzy", '', '').length
+
+    assert_equal 2, exact.match(list, 'extended', '', '').length
+    assert_equal 2, exact.match(list, 'mode extended', '', '').length
+    assert_equal 0, exact.match(list, 'xtndd', '', '').length
+    assert_equal 1, exact.match(list, "'-fuzzy", '', '').length
+    assert_equal 2, exact.match(list, "-fuzzy", '', '').length
+  end
+
   if RUBY_PLATFORM =~ /darwin/
     NFD = '한글'
     def test_nfc
@@ -425,5 +473,62 @@ class TestFZF < MiniTest::Unit::TestCase
     tokens        = fzf.format line, 80, offsets
     assert_equal [], tokens
   end
+
+  def test_mouse_event
+    interval = FZF::MouseEvent::DOUBLE_CLICK_INTERVAL
+    me = FZF::MouseEvent.new nil
+    me.v = 10
+    assert_equal false, me.double?(10)
+    assert_equal false, me.double?(20)
+    me.v = 20
+    assert_equal false, me.double?(10)
+    assert_equal false, me.double?(20)
+    me.v = 20
+    assert_equal false, me.double?(10)
+    assert_equal true,  me.double?(20)
+    sleep interval
+    assert_equal false,  me.double?(20)
+  end
+
+  def test_nth_match
+    list = [
+      ' first  second  third',
+      'fourth	 fifth   sixth',
+    ]
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE
+    assert_equal list, matcher.match(list, 'f', '', '').map(&:first)
+    assert_equal [
+      [list[0], [[2,  5]]],
+      [list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 2
+    assert_equal [[list[1], [[8, 9]]]], matcher.match(list, 'f', '', '')
+    assert_equal [[list[0], [[8, 9]]]], matcher.match(list, 's', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 3
+    assert_equal [[list[0], [[19, 20]]]], matcher.match(list, 'r', '', '')
+
+    regex = FZF.build_delim_regex "\t"
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 1, regex
+    assert_equal [[list[0], [[3, 10]]]], matcher.match(list, 're', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 2, regex
+    assert_equal [], matcher.match(list, 'r', '', '')
+    assert_equal [[list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
+
+    # Negative indexing
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, -1, regex
+    assert_equal [[list[0], [[3, 6]]]], matcher.match(list, 'rt', '', '')
+    assert_equal [[list[0], [[2, 5]]], [list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
+
+    # Regex delimiter
+    regex = FZF.build_delim_regex "[ \t]+"
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 1, regex
+    assert_equal [list[1]], matcher.match(list, 'f', '', '').map(&:first)
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, 2, regex
+    assert_equal [[list[0], [[1, 2]]], [list[1], [[8, 9]]]], matcher.match(list, 'f', '', '')
+  end
 end