diff --git a/README.md b/README.md index 58a3827..22fce29 100644 --- a/README.md +++ b/README.md @@ -285,17 +285,16 @@ 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_width` | number/string | Use tmux vertical split with the given height (e.g. `20`, `50%`) | -| `tmux_height` | number/string | Use tmux horizontal split with the given height (e.g. `20`, `50%`) | -| `launcher` | string | External terminal emulator to start fzf with (Only used in GVim) | +| 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 | +| `up`/`down`/`left`/`right` | number/string | Use tmux pane with the given size (e.g. `20`, `50%`) | +| `launcher` | string | External terminal emulator to start fzf with (Only used in GVim) | ##### Examples @@ -321,10 +320,10 @@ nnoremap C :call fzf#run({ \ 'source': \ map(split(globpath(&rtp, "colors/*.vim"), "\n"), \ "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"), -\ 'sink': 'colo', -\ 'options': '+m', -\ 'tmux_width': 20, -\ 'launcher': 'xterm -geometry 20x30 -e bash -ic %s' +\ 'sink': 'colo', +\ 'options': '+m', +\ 'left': 20, +\ 'launcher': 'xterm -geometry 20x30 -e bash -ic %s' \ }) ``` @@ -345,10 +344,10 @@ function! BufOpen(e) endfunction nnoremap :call fzf#run({ -\ 'source': reverse(BufList()), -\ 'sink': function('BufOpen'), -\ 'options': '+m', -\ 'tmux_height': '40%' +\ 'source': reverse(BufList()), +\ 'sink': function('BufOpen'), +\ 'options': '+m', +\ 'down': '40%' \ }) ``` diff --git a/bin/fzf-tmux b/bin/fzf-tmux index 0eb2e37..324562a 100755 --- a/bin/fzf-tmux +++ b/bin/fzf-tmux @@ -7,9 +7,13 @@ opt="" skip="" swap="" close="" +term="" while [ $# -gt 0 ]; do arg="$1" case "$arg" in + -) + term=1 + ;; -w*|-h*|-d*|-u*|-r*|-l*) if [ -n "$skip" ]; then args+=("$1") @@ -53,7 +57,11 @@ while [ $# -gt 0 ]; do fi else if [ -n "$swap" ]; then - [[ "$arg" =~ ^.l ]] && max=$(tput cols) || max=$(tput lines) + if [[ "$arg" =~ ^.l ]]; then + [ -n "$COLUMNS" ] && max=$COLUMNS || max=$(tput cols) + else + [ -n "$LINES" ] && max=$LINES || max=$(tput lines) + fi size=$(( max - size )) [ $size -lt 0 ] && size=0 opt="$opt -l $size" @@ -103,7 +111,7 @@ envs="FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS") FZF_DEFAULT_COMMAND=$(pr mkfifo $fifo2 mkfifo $fifo3 -if [ -t 0 ]; then +if [ -n "$term" -o -t 0 ]; then tmux set-window-option -q synchronize-panes off \;\ split-window $opt "$envs"' sh -c "'$fzf' '"$fzf_args"' > '$fifo2'; echo \$? > '$fifo3' '"$close"'"' $swap else diff --git a/plugin/fzf.vim b/plugin/fzf.vim index ba49c7e..69e7f71 100644 --- a/plugin/fzf.vim +++ b/plugin/fzf.vim @@ -21,12 +21,11 @@ " 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:min_tmux_width = 10 -let s:min_tmux_height = 3 let s:default_tmux_height = '40%' let s:launcher = 'xterm -e bash -ic %s' let s:fzf_go = expand(':h:h').'/bin/fzf' let s:fzf_rb = expand(':h:h').'/fzf' +let s:fzf_tmux = expand(':h:h').'/bin/fzf-tmux' let s:cpo_save = &cpo set cpo&vim @@ -66,7 +65,7 @@ function! s:tmux_enabled() endif let s:tmux = 0 - if exists('$TMUX') + if exists('$TMUX') && executable(s:fzf_tmux) let output = system('tmux -V') let s:tmux = !v:shell_error && output >= 'tmux 1.7' endif @@ -81,8 +80,23 @@ function! s:escape(path) return substitute(a:path, ' ', '\\ ', 'g') endfunction +" Upgrade legacy options +function! s:upgrade(dict) + let copy = copy(a:dict) + if has_key(copy, 'tmux') + let copy.down = remove(copy, 'tmux') + endif + if has_key(copy, 'tmux_height') + let copy.down = remove(copy, 'tmux_height') + endif + if has_key(copy, 'tmux_width') + let copy.right = remove(copy, 'tmux_width') + endif + return copy +endfunction + function! fzf#run(...) abort - let dict = exists('a:1') ? a:1 : {} + let dict = exists('a:1') ? s:upgrade(a:1) : {} let temps = { 'result': tempname() } let optstr = get(dict, 'options', '') try @@ -106,26 +120,41 @@ function! fzf#run(...) abort else let prefix = '' endif - let command = prefix.fzf_exec.' '.optstr.' > '.temps.result + let split = s:tmux_enabled() && s:tmux_splittable(dict) + let command = prefix.(split ? s:fzf_tmux(dict) : fzf_exec).' '.optstr.' > '.temps.result - if s:tmux_enabled() && s:tmux_splittable(dict) + if split return s:execute_tmux(dict, command, temps) else return s:execute(dict, command, temps) endif endfunction +function! s:fzf_tmux(dict) + let size = '' + for o in ['up', 'down', 'left', 'right'] + if has_key(a:dict, o) + let size = '-'.o[0].a:dict[o] + endif + endfor + return printf('LINES=%d COLUMNS=%d %s %s %s --', + \ &lines, &columns, s:fzf_tmux, size, (has_key(a:dict, 'source') ? '' : '-')) +endfunction + function! s:tmux_splittable(dict) - return - \ min([&columns, get(a:dict, 'tmux_width', 0)]) >= s:min_tmux_width || - \ min([&lines, get(a:dict, 'tmux_height', get(a:dict, 'tmux', 0))]) >= s:min_tmux_height + return has_key(a:dict, 'up') || + \ has_key(a:dict, 'down') || + \ has_key(a:dict, 'left') || + \ has_key(a:dict, 'right') endfunction function! s:pushd(dict) if !empty(get(a:dict, 'dir', '')) let a:dict.prev_dir = getcwd() execute 'chdir '.s:escape(a:dict.dir) + return 1 endif + return 0 endfunction function! s:popd(dict) @@ -153,7 +182,7 @@ function! s:execute(dict, command, temps) endif return [] else - return s:callback(a:dict, a:temps, 0) + return s:callback(a:dict, a:temps) endif endfunction @@ -166,58 +195,20 @@ function! s:env_var(name) endfunction function! s:execute_tmux(dict, command, temps) - let command = s:env_var('FZF_DEFAULT_OPTS').s:env_var('FZF_DEFAULT_COMMAND').a:command - if !empty(get(a:dict, 'dir', '')) + let command = a:command + if s:pushd(a:dict) + " -c '#{pane_current_path}' is only available on tmux 1.9 or above let command = 'cd '.s:escape(a:dict.dir).' && '.command endif - let splitopt = '-v' - if has_key(a:dict, 'tmux_width') - let splitopt = '-h' - let size = a:dict.tmux_width - else - let size = get(a:dict, 'tmux_height', get(a:dict, 'tmux')) - endif - - if type(size) == 1 && size =~ '%$' - let sizeopt = '-p '.size[0:-2] - else - let sizeopt = '-l '.size - endif - - let s:pane = substitute( - \ system( - \ printf( - \ 'tmux split-window %s %s -P -F "#{pane_id}" %s', - \ splitopt, sizeopt, 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 + call system(command) + call s:callback(a:dict, a:temps) 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) +function! s:callback(dict, temps) 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 @@ -246,7 +237,7 @@ function! s:cmd(bang, ...) abort let opts.dir = remove(args, -1) endif if !a:bang - let opts.tmux = get(g:, 'fzf_tmux_height', s:default_tmux_height) + let opts.down = get(g:, 'fzf_tmux_height', s:default_tmux_height) endif call fzf#run(extend({ 'sink': 'e', 'options': join(args) }, opts)) endfunction