Merge pull request #17 from junegunn/mouse

Add mouse support

README.md

@@ -24,12 +24,11 @@ git clone https://github.com/junegunn/fzf.git ~/.fzf
 ~/.fzf/install
 ```
 
-The script will generate `~/.fzf.bash` and `~/.fzf.zsh` and update your
-`.bashrc` and `.zshrc` to load them.
+The script will setup:
 
-Or you can just download
-[fzf executable](https://raw.github.com/junegunn/fzf/master/fzf) and put it
-somewhere in your search $PATH.
+- `fzf` executable
+- Key bindings (`CTRL-T`, `CTRL-R`, etc.)
+- Fuzzy auto-completion for bash
 
 ### Install as Vim plugin
 
@@ -52,14 +51,20 @@ Usage
 ```
 usage: fzf [options]
 
-    -m, --multi      Enable multi-select
-    -x, --extended   Extended-search mode
-    -q, --query=STR  Initial query
-    -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
+  Options
+    -m, --multi          Enable multi-select
+    -x, --extended       Extended-search mode
+    -q, --query=STR      Initial query
+    -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
+        --no-mouse       Disable mouse
+
+  Environment variables
+    FZF_DEFAULT_COMMAND  Default command to use when input is tty
+    FZF_DEFAULT_OPTS     Defaults options. (e.g. "-x -m --sort 10000")
 ```
 
 fzf will launch curses-based finder, read the list from STDIN, and write the
@@ -99,6 +104,9 @@ The following readline key bindings should also work as expected.
 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.
+
 ### Extended-search mode
 
 With `-x` or `--extended` option, fzf will start in "extended-search mode".
@@ -115,44 +123,6 @@ such as: `^music .mp3$ sbtrkt !rmx`
 | `'wild`  | Items that include `wild`        | exact-match (quoted) |
 | `!'fire` | Items that do not include `fire` | inverse-exact-match  |
 
-Usage as Vim plugin
--------------------
-
-If you install fzf as a Vim plugin, `:FZF` command will be added.
-
-```vim
-" Look for files under current directory
-:FZF
-
-" Look for files under your home directory
-:FZF ~
-
-" With options
-:FZF --no-sort -m /tmp
-```
-
-You can override the source command which produces input to fzf.
-
-```vim
-let g:fzf_source = 'find . -type f'
-```
-
-And you can predefine default options to fzf command.
-
-```vim
-let g:fzf_options = '--no-color --extended'
-```
-
-For more advanced uses, you can call `fzf#run` function as follows.
-
-```vim
-:call fzf#run('tabedit', '-m +c')
-```
-
-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.
-
 Useful examples
 ---------------
 
@@ -186,32 +156,14 @@ fkill() {
 Key bindings for command line
 -----------------------------
 
-The install script will add the following key bindings to your configuration
-files.
+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
 
-```sh
-# Required to refresh the prompt after fzf
-bind '"\er": redraw-current-line'
-
-# CTRL-T - Paste the selected file path into the command line
-fsel() {
-  find * -path '*/\.*' -prune \
-    -o -type f -print \
-    -o -type l -print 2> /dev/null | fzf -m | while read item; do
-    printf '%q ' "$item"
-  done
-  echo
-}
-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"'
-
-# 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"'
-```
+The source code can be found in `~/.fzf.bash`.
 
 ### zsh
 
@@ -219,41 +171,7 @@ bind '"\C-r": " \C-e\C-u$(history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
 - `CTRL-R` - Paste the selected command from history into the command line
 - `ALT-C` - cd into the selected directory
 
-```sh
-# CTRL-T - Paste the selected file path(s) into the command line
-fzf-file-widget() {
-  local FILES
-  local IFS="
-"
-  FILES=($(
-    find * -path '*/\.*' -prune \
-    -o -type f -print \
-    -o -type l -print 2> /dev/null | fzf -m))
-  unset IFS
-  FILES=$FILES:q
-  LBUFFER="${LBUFFER%% #} $FILES"
-  zle redisplay
-}
-zle     -N   fzf-file-widget
-bindkey '^T' fzf-file-widget
-
-# ALT-C - cd into the selected directory
-fzf-cd-widget() {
-  cd "${$(find * -path '*/\.*' -prune \
-          -o -type d -print 2> /dev/null | fzf):-.}"
-  zle reset-prompt
-}
-zle     -N    fzf-cd-widget
-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]* *//")
-  zle redisplay
-}
-zle     -N   fzf-history-widget
-bindkey '^R' fzf-history-widget
-```
+The source code can be found in `~/.fzf.zsh`.
 
 Auto-completion
 ---------------
@@ -305,11 +223,11 @@ kill -9 <TAB>
 #### Host names
 
 For ssh and telnet commands, fuzzy completion for host names is provided. The
-names are extracted from /etc/hosts file.
+names are extracted from /etc/hosts and ~/.ssh/config.
 
 ```sh
-ssh <TAB>
-telnet <TAB>
+ssh **<TAB>
+telnet **<TAB>
 ```
 
 #### Settings
@@ -328,6 +246,44 @@ TODO :smiley:
 
 (Pull requests are appreciated.)
 
+Usage as Vim plugin
+-------------------
+
+If you install fzf as a Vim plugin, `:FZF` command will be added.
+
+```vim
+" Look for files under current directory
+:FZF
+
+" Look for files under your home directory
+:FZF ~
+
+" With options
+:FZF --no-sort -m /tmp
+```
+
+You can override the source command which produces input to fzf.
+
+```vim
+let g:fzf_source = 'find . -type f'
+```
+
+And you can predefine default options to fzf command.
+
+```vim
+let g:fzf_options = '--no-color --extended'
+```
+
+For more advanced uses, you can call `fzf#run` function as follows.
+
+```vim
+:call fzf#run('tabedit', '-m +c')
+```
+
+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.
+
 Tips
 ----
 
@@ -368,10 +324,10 @@ is less than the limit which is by default 1000, in order to avoid the cost of
 sorting a large list and limit the response time of the query.
 
 This limit can be adjusted with `-s` option, or with the environment variable
-`FZF_DEFAULT_SORT`.
+`FZF_DEFAULT_OPTS`.
 
 ```sh
-export FZF_DEFAULT_SORT=10000
+export FZF_DEFAULT_OPTS="--sort 20000"
 ```
 
 License

fzf

@@ -7,10 +7,11 @@
 #  / __/ / /_/ __/
 # /_/   /___/_/    Fuzzy finder for your shell
 #
-# URL:         https://github.com/junegunn/fzf
-# Author:      Junegunn Choi
-# License:     MIT
-# Last update: December 20, 2013
+# Version: 0.7.0 (January 30, 2014)
+#
+# Author:  Junegunn Choi
+# URL:     https://github.com/junegunn/fzf
+# License: MIT
 #
 # Copyright (c) 2013 Junegunn Choi
 #
@@ -39,9 +40,17 @@ require 'thread'
 require 'curses'
 require 'set'
 
+unless String.method_defined? :force_encoding
+  class String
+    def force_encoding *arg
+      self
+    end
+  end
+end
+
 class FZF
   C = Curses
-  attr_reader :rxflag, :sort, :color, :multi, :query
+  attr_reader :rxflag, :sort, :color, :mouse, :multi, :query, :extended
 
   class AtomicVar
     def initialize value
@@ -67,22 +76,34 @@ class FZF
   end
 
   def initialize argv, source = $stdin
-    @rxflag = nil
-    @sort   = ENV.fetch('FZF_DEFAULT_SORT', 1000).to_i
-    @color  = true
-    @multi  = false
-    @xmode  = false
+    @rxflag   = nil
+    @sort     = ENV.fetch('FZF_DEFAULT_SORT', 1000).to_i
+    @color    = true
+    @multi    = false
+    @extended = false
+    @mouse    = true
 
-    argv = argv.dup
+    argv =
+      if opts = ENV['FZF_DEFAULT_OPTS']
+        require 'shellwords'
+        Shellwords.shellwords(opts) + argv
+      else
+        argv.dup
+      end
     while o = argv.shift
       case o
-      when '-h', '--help'     then usage 0
-      when '-m', '--multi'    then @multi  = true
-      when '-x', '--extended' then @xmode  = true
-      when '-i'               then @rxflag = Regexp::IGNORECASE
-      when '+i'               then @rxflag = 0
-      when '+s', '--no-sort'  then @sort   = nil
-      when '+c', '--no-color' then @color  = false
+      when '--version'           then version
+      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 '-i'                  then @rxflag   = Regexp::IGNORECASE
+      when '+i'                  then @rxflag   = 0
+      when '-c', '--color'       then @color    = true
+      when '+c', '--no-color'    then @color    = false
+      when       '--no-mouse'    then @mouse    = false
+      when '+s', '--no-sort'     then @sort     = nil
       when '-q', '--query'
         usage 1, 'query string required' unless query = argv.shift
         @query = AtomicVar.new query.dup
@@ -99,7 +120,7 @@ class FZF
       end
     end
 
-    @source   = source
+    @source   = source.clone
     @mtx      = Mutex.new
     @cv       = ConditionVariable.new
     @events   = {}
@@ -128,18 +149,35 @@ class FZF
     start_loop
   end
 
+  def version
+    File.open(__FILE__, 'r') do |f|
+      f.each_line do |line|
+        if line =~ /Version: (.*)/
+          $stdout.puts "fzf " << $1
+          exit
+        end
+      end
+    end
+  end
+
   def usage x, message = nil
     $stderr.puts message if message
     $stderr.puts %[usage: fzf [options]
 
-    -m, --multi      Enable multi-select
-    -x, --extended   Extended-search mode
-    -q, --query=STR  Initial query
-    -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]
+  Options
+    -m, --multi          Enable multi-select
+    -x, --extended       Extended-search mode
+    -q, --query=STR      Initial query
+    -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
+        --no-mouse       Disable mouse
+
+  Environment variables
+    FZF_DEFAULT_COMMAND  Default command to use when input is tty
+    FZF_DEFAULT_OPTS     Defaults options. (e.g. "-x -m --sort 10000")] + $/ + $/
     exit x
   end
 
@@ -394,7 +432,7 @@ class FZF
   if RUBY_VERSION.split('.').map { |e| e.rjust(3, '0') }.join > '001009'
     @@wrx = Regexp.new '\p{Han}|\p{Katakana}|\p{Hiragana}|\p{Hangul}'
     def width str
-      str.gsub(@@wrx, '  ').length
+      str.gsub(@@wrx, '  ').length rescue str.length
     end
 
     def trim str, len, left
@@ -436,6 +474,11 @@ 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.start_color
     dbg =
       if C.respond_to?(:use_default_colors)
@@ -445,6 +488,7 @@ class FZF
         C::COLOR_BLACK
       end
     C.raw
+    C.nonl
     C.noecho
 
     if @color
@@ -500,6 +544,7 @@ class FZF
           exit 1
         end
       else
+        $stdin.reopen IO.open(IO.sysopen('/dev/tty'), 'r')
         @source
       end
 
@@ -513,7 +558,7 @@ class FZF
   end
 
   def start_search
-    matcher  = (@xmode ? ExtendedFuzzyMatcher : FuzzyMatcher).new @rxflag
+    matcher  = (@extended ? ExtendedFuzzyMatcher : FuzzyMatcher).new @rxflag
     searcher = Thread.new {
       lists   = []
       events  = {}
@@ -556,26 +601,25 @@ class FZF
           if new_search && !lists.empty?
             q, cx = events.delete(:key) || [q, 0]
             empty = matcher.empty?(q)
-            matches = fcache[q] ||=
-              begin
-                found = []
-                skip  = false
-                cnt   = 0
-                lists.each do |list|
-                  cnt += list.length
-                  skip = @mtx.synchronize { @events[:key] }
-                  break if skip
+            unless matches = fcache[q]
+              found = []
+              skip  = false
+              cnt   = 0
+              lists.each do |list|
+                cnt += list.length
+                skip = @mtx.synchronize { @events[:key] }
+                break if skip
 
-                  if !empty && (progress = 100 * cnt / @count.get) < 100 && Time.now - started_at > 0.5
-                    render { print_info " (#{progress}%)" }
-                  end
-
-                  found.concat(q.empty? ? list :
-                               matcher.match(list, q, q[0, cx], q[cx..-1]))
+                if !empty && (progress = 100 * cnt / @count.get) < 100 && Time.now - started_at > 0.5
+                  render { print_info " (#{progress}%)" }
                 end
-                next if skip
-                @sort ? found : found.reverse
+
+                found.concat(q.empty? ? list :
+                             matcher.match(list, q, q[0, cx], q[cx..-1]))
               end
+              next if skip
+              matches = fcache[q] = @sort ? found : found.reverse
+            end
 
             if !empty && @sort && matches.length <= @sort
               matches = sort_by_rank(matches)
@@ -639,6 +683,7 @@ class FZF
   def start_renderer
     Thread.new do
       begin
+        refresh
         while blk = @queue.shift
           blk.call
           refresh
@@ -654,10 +699,32 @@ class FZF
     nil
   end
 
+  def vselect &prc
+    @vcursor.set { |v| @vcursors << v; prc.call v }
+    update_list false
+  end
+
+  def num_unicode_bytes chr
+    # http://en.wikipedia.org/wiki/UTF-8
+    if chr & 0b10000000 > 0
+      bytes = 0
+      7.downto(2) do |shift|
+        break if (chr >> shift) & 0x1 == 0
+        bytes += 1
+      end
+      bytes
+    else
+      1
+    end
+  end
+
+  def test_mouse st, *states
+    states.any? { |s| s & st > 0 }
+  end
+
   def start_loop
     got = nil
     begin
-      tty     = IO.open(IO.sysopen('/dev/tty'), 'r')
       input   = @query.get.dup
       cursor  = input.length
       backword = proc {
@@ -673,74 +740,115 @@ class FZF
         ctrl(:u) => proc { input = input[cursor..-1]; cursor = 0 },
         ctrl(:a) => proc { cursor = 0; nil },
         ctrl(:e) => proc { cursor = input.length; nil },
-        ctrl(:j) => proc { @vcursor.set { |v| @vcursors << v; v - 1 }; update_list false },
-        ctrl(:k) => proc { @vcursor.set { |v| @vcursors << v; v + 1 }; update_list false },
+        ctrl(:j) => proc { vselect { |v| v - 1 } },
+        ctrl(:k) => proc { vselect { |v| v + 1 } },
         ctrl(:w) => proc {
           pcursor = cursor
           backword.call
           input = input[0...cursor] + input[pcursor..-1]
         },
-        127 => proc { input[cursor -= 1] = '' if cursor > 0 },
-        9   => proc { |o|
+        ctrl(:h) => proc { input[cursor -= 1] = '' if cursor > 0 },
+        ctrl(:i) => proc { |o|
           if @multi && sel = pick
             if @selects.has_key? sel
               @selects.delete sel
             else
               @selects[sel] = 1
             end
-            @vcursor.set { |v|
-              @vcursors << v
-              v + (o == :stab ? 1 : -1)
+            vselect { |v|
+              v + case o
+                  when :select     then 0
+                  when C::KEY_BTAB then 1
+                  else -1
+                  end
             }
-            update_list false
           end
         },
-        :left  => proc { cursor = [0, cursor - 1].max; nil },
-        :right => proc { cursor = [input.length, cursor + 1].min; nil },
+        ctrl(:b) => proc { cursor = [0, cursor - 1].max; nil },
+        ctrl(:f) => proc { cursor = [input.length, cursor + 1].min; nil },
         :alt_b => proc { backword.call; nil },
         :alt_f => proc {
           cursor += (input[cursor..-1].index(/(\S\s)|(.$)/) || -1) + 1
           nil
         },
       }
-      actions[ctrl(:b)] = actions[:left]
-      actions[ctrl(:f)] = actions[:right]
-      actions[ctrl(:h)] = actions[127]
-      actions[ctrl(:n)] = actions[ctrl(:j)]
-      actions[ctrl(:p)] = actions[ctrl(:k)]
+      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(:q)] = actions[ctrl(:g)] = actions[ctrl(:c)] = actions[:esc]
-      actions[:stab]    = actions[9]
 
       emit(:key) { [@query.get, cursor] } unless @query.empty?
+      pmv = nil
       while true
         @cursor_x.set cursor
         render { print_input }
 
-        ord = tty.getc.ord
-        ord =
-          case ord = (tty.read_nonblock(1).ord rescue :esc)
-          when 91
-            case (tty.read_nonblock(1).ord rescue nil)
-            when 68 then :left
-            when 67 then :right
-            when 66 then ctrl(:j)
-            when 65 then ctrl(:k)
-            when 90 then :stab
-            else         next
-            end
-          when 'b'.ord then :alt_b
-          when 'f'.ord then :alt_f
-          when :esc    then :esc
-          else              next
-          end if ord == 27
+        C.stdscr.timeout = -1
+        ch = C.getch
 
-        upd = actions.fetch(ord, proc { |ord|
-          char = [ord].pack('U*')
-          if char =~ /[[:print:]]/
-            input.insert cursor, char
+        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(ord)
+        }).call(ch)
 
         # Dispatch key event
         emit(:key) { [@query.set(input.dup), cursor] } if upd

fzf-completion.bash

@@ -31,12 +31,12 @@ _fzf_opts_completion() {
 }
 
 _fzf_generic_completion() {
-  local cur base dir leftover matches
+  local cur base dir leftover matches trigger
   COMPREPLY=()
-  FZF_COMPLETION_TRIGGER=${FZF_COMPLETION_TRIGGER:-**}
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
   cur="${COMP_WORDS[COMP_CWORD]}"
-  if [[ ${cur} == *"$FZF_COMPLETION_TRIGGER" ]]; then
-    base=${cur:0:${#cur}-${#FZF_COMPLETION_TRIGGER}}
+  if [[ ${cur} == *"$trigger" ]]; then
+    base=${cur:0:${#cur}-${#trigger}}
     eval base=$base
 
     dir="$base"
@@ -96,11 +96,12 @@ _fzf_kill_completion() {
   fi
 }
 
-_fzf_host_completion() {
-  local cur prev selected
+_fzf_telnet_completion() {
+  local cur selected trigger
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
   cur="${COMP_WORDS[COMP_CWORD]}"
-  prev="${COMP_WORDS[COMP_CWORD-1]}"
-  [[ "$cur" =~ ^- || "$prev" =~ ^- ]] && return 1
+  [[ ${cur} == *"$trigger" ]] || return 1
+  cur=${cur:0:${#cur}-${#trigger}}
 
   tput sc
   selected=$(grep -v '^\s*\(#\|$\)' /etc/hosts | awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
@@ -112,6 +113,26 @@ _fzf_host_completion() {
   fi
 }
 
+_fzf_ssh_completion() {
+  local cur selected trigger
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  [[ ${cur} == *"$trigger" ]] || return 1
+  cur=${cur:0:${#cur}-${#trigger}}
+
+  tput sc
+  selected=$(cat \
+    <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | grep -i ^host) \
+    <(grep -v '^\s*\(#\|$\)' /etc/hosts) | \
+    awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
+  tput rc
+
+  if [ -n "$selected" ]; then
+    COMPREPLY=("$selected")
+    return 0
+  fi
+}
+
 complete -F _fzf_opts_completion fzf
 
 # Directory
@@ -141,7 +162,6 @@ done
 complete -F _fzf_kill_completion -o nospace -o default -o bashdefault kill
 
 # Host completion
-for cmd in "ssh telnet"; do
-  complete -F _fzf_host_completion -o default -o bashdefault $cmd
-done
+complete -F _fzf_ssh_completion -o default -o bashdefault ssh
+complete -F _fzf_telnet_completion -o default -o bashdefault telnet
 

fzf.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fzf'
-  spec.version       = '0.6.0'
+  spec.version       = '0.7.0'
   spec.authors       = ['Junegunn Choi']
   spec.email         = ['junegunn.c@gmail.com']
   spec.description   = %q{Fuzzy finder for your shell}
@@ -12,4 +12,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = '.'
   spec.files         = %w[fzf.gemspec]
   spec.executables   = 'fzf'
+
+  spec.add_runtime_dependency 'curses', '~> 1.0.0'
 end

install

@@ -10,23 +10,44 @@ if [ $? -ne 0 ]; then
   echo "ruby executable not found!"
   exit 1
 fi
-echo "OK"
+
+# System ruby is preferred
+curses_check="begin; require 'curses'; rescue Exception; exit 1; end"
+system_ruby=/usr/bin/ruby
+if [ -x $system_ruby -a $system_ruby != "$ruby" ]; then
+  $system_ruby --disable-gems -e "$curses_check" 2> /dev/null
+  [ $? -eq 0 ] && ruby=$system_ruby
+fi
+
+echo "OK ($ruby)"
 
 # Curses-support
 echo -n "Checking Curses support ... "
-/usr/bin/env ruby -e "begin; require 'curses'; rescue Exception; exit 1; end"
-if [ $? -ne 0 ]; then
-  echo "Your ruby does not support 'curses'"
-  exit 1
+"$ruby" -e "$curses_check"
+if [ $? -eq 0 ]; then
+  echo "OK"
+else
+  echo "Not found"
+  echo "Installing 'curses' gem ... "
+  /usr/bin/env gem install curses
+  if [ $? -ne 0 ]; then
+    echo "Failed to install 'curses' gem."
+    echo "Try installing it as root: sudo gem install curses"
+    exit 1
+  fi
 fi
-echo "OK"
 
 # Ruby version
 echo -n "Checking Ruby version ... "
-/usr/bin/env ruby -e 'exit RUBY_VERSION >= "1.9"'
+"$ruby" -e 'exit RUBY_VERSION >= "1.9"'
 if [ $? -eq 0 ]; then
   echo ">= 1.9"
-  fzf_cmd="$ruby --disable-gems $fzf_base/fzf"
+  "$ruby" --disable-gems -e "$curses_check"
+  if [ $? -eq 0 ]; then
+    fzf_cmd="$ruby --disable-gems $fzf_base/fzf"
+  else
+    fzf_cmd="$ruby $fzf_base/fzf"
+  fi
 else
   echo "< 1.9"
   fzf_cmd="$ruby $fzf_base/fzf"
@@ -78,7 +99,7 @@ EOF
 bind '"\er": redraw-current-line'
 
 # CTRL-T - Paste the selected file path into the command line
-fsel() {
+__fsel() {
   find * -path '*/\.*' -prune \
     -o -type f -print \
     -o -type l -print 2> /dev/null | fzf -m | while read item; do
@@ -86,7 +107,7 @@ fsel() {
   done
   echo
 }
-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"'
+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"'
 
 # 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"'
@@ -154,9 +175,9 @@ for shell in bash zsh; do
 done
 
 cat << EOF
-Finished. Reload your .bashrc or .zshrc to take effect.
-   source ~/.bashrc  # bash"
-   source ~/.zshrc   # zsh"
+Finished. Reload your .bashrc or .zshrc.
+   source ~/.bashrc  # bash
+   source ~/.zshrc   # zsh
 
 To uninstall fzf, simply remove the added line.
 EOF

test/test_fzf.rb

@@ -7,43 +7,78 @@ ENV['FZF_EXECUTABLE'] = '0'
 load 'fzf'
 
 class TestFZF < MiniTest::Unit::TestCase
+
+  def setup
+    ENV.delete 'FZF_DEFAULT_SORT'
+    ENV.delete 'FZF_DEFAULT_OPTS'
+    ENV.delete 'FZF_DEFAULT_COMMAND'
+  end
+
   def test_default_options
     fzf = FZF.new []
     assert_equal 1000,  fzf.sort
     assert_equal false, fzf.multi
     assert_equal true,  fzf.color
     assert_equal nil,   fzf.rxflag
+    assert_equal true,  fzf.mouse
+  end
 
-    begin
-      ENV['FZF_DEFAULT_SORT'] = '1500'
-      fzf = FZF.new []
-      assert_equal 1500, fzf.sort
-    ensure
-      ENV.delete 'FZF_DEFAULT_SORT'
-    end
+  def test_environment_variables
+    # Deprecated
+    ENV['FZF_DEFAULT_SORT'] = '20000'
+    fzf = FZF.new []
+    assert_equal 20000, fzf.sort
+
+    ENV['FZF_DEFAULT_OPTS'] = '-x -m -s 10000 -q "  hello  world  " +c --no-mouse'
+    fzf = FZF.new []
+    assert_equal 10000,   fzf.sort
+    assert_equal '  hello  world  ',
+                          fzf.query.get
+    assert_equal true,    fzf.extended
+    assert_equal true,    fzf.multi
+    assert_equal false,   fzf.color
+    assert_equal false,   fzf.mouse
   end
 
   def test_option_parser
     # Long opts
-    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello]
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello --extended --no-mouse]
     assert_equal 2000,    fzf.sort
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
+    assert_equal false,   fzf.mouse
     assert_equal 0,       fzf.rxflag
     assert_equal 'hello', fzf.query.get
+    assert_equal true,    fzf.extended
+
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello
+                     --no-sort -i --color --no-multi]
+    assert_equal nil,     fzf.sort
+    assert_equal false,   fzf.multi
+    assert_equal true,    fzf.color
+    assert_equal true,    fzf.mouse
+    assert_equal 1,       fzf.rxflag
+    assert_equal 'hello', fzf.query.get
+    assert_equal false,   fzf.extended
 
     # Short opts
-    fzf = FZF.new %w[-s 2000 +c -m +i -qhello]
+    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x]
     assert_equal 2000,    fzf.sort
     assert_equal true,    fzf.multi
     assert_equal false,   fzf.color
     assert_equal 0,       fzf.rxflag
     assert_equal 'hello', fzf.query.get
+    assert_equal true,    fzf.extended
 
     # Left-to-right
-    fzf = FZF.new %w[-qhello -s 2000 --no-sort -q world]
-    assert_equal nil,     fzf.sort
+    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x
+                     -s 3000 -c +m -i -q world +x]
+    assert_equal 3000,    fzf.sort
+    assert_equal false,   fzf.multi
+    assert_equal true,    fzf.color
+    assert_equal 1,       fzf.rxflag
     assert_equal 'world', fzf.query.get
+    assert_equal false,   fzf.extended
 
     fzf = FZF.new %w[--query hello +s -s 2000 --query=world]
     assert_equal 2000,    fzf.sort