Skip to content

Commit

Permalink
feat: add RnvimrStartBackGround command (#113)
Browse files Browse the repository at this point in the history
Improve user experience for first toggling if don't care the
resource for preload Ranger.
  • Loading branch information
kevinhwang91 committed May 9, 2022
1 parent 64f26bf commit 07689e9
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 20 deletions.
52 changes: 32 additions & 20 deletions autoload/rnvimr.vim
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,45 @@ function! s:setup_winhl() abort
call setwinvar(rnvimr#context#winid(), '&winhighlight', default_winhl)
endfunction

function! s:create_ranger(cmd, env) abort
function! s:create_ranger(cmd, env, is_background) abort
let init_layout = rnvimr#layout#get_init_layout()
if get(g:, 'rnvimr_draw_border', 1) && (has('mac') || has('macunix'))
let init_layout.width -= 1
endif
call rnvimr#context#bufnr(nvim_create_buf(v:false, v:true))
call rnvimr#context#winid(
\ nvim_open_win(rnvimr#context#bufnr(), v:true, init_layout))
if a:is_background
noa let winid = nvim_open_win(rnvimr#context#bufnr(), v:true, init_layout)
else
let winid = nvim_open_win(rnvimr#context#bufnr(), v:true, init_layout)
endif
call rnvimr#context#winid(winid)
let cmd = a:cmd
if type(a:env) == v:t_list && !empty(a:env)
let cmd = join(a:env) . ' ' . cmd
endif
call termopen(cmd, {'on_exit': function('s:on_exit')})
setfiletype rnvimr
call s:setup_winhl()
startinsert
if !a:is_background
startinsert
endif
augroup RnvimrTerm
autocmd!
autocmd VimResized <buffer> call s:redraw_win()
autocmd VimLeavePre * call rnvimr#rpc#destroy()
if get(g:, 'rnvimr_enable_bw', 0)
autocmd TermEnter,WinEnter <buffer> call rnvimr#context#check_point()
autocmd WinLeave <buffer> call rnvimr#context#buf_wipe()
endif
if s:shadow_winblend < 100 && s:shadow_winblend >= 0
autocmd TermEnter,WinEnter <buffer> call rnvimr#shadowwin#create(s:shadow_winblend)
autocmd WinLeave <buffer> call rnvimr#shadowwin#destroy()
autocmd VimResized <buffer> call rnvimr#shadowwin#reszie()
endif
augroup END
if a:is_background
noa call nvim_win_close(winid, 0)
endif
endfunction

function! s:defer_check_dir(path, bufnr) abort
Expand Down Expand Up @@ -154,9 +177,12 @@ function! rnvimr#open(path) abort
endif
endfunction

" a:1 select_file
" a:2 is_background
function! rnvimr#init(...) abort
let $NVIM_LISTEN_ADDRESS = v:servername
let select_file = empty(a:000) ? expand('%:p') : a:1
let select_file = empty(get(a:000, 0, '')) ? expand('%:p') : a:1
let is_background = get(a:000, 1, 0)
let confdir = shellescape(s:confdir)
" https://github.com/kevinhwang91/rnvimr/issues/80
if filewritable(s:confdir) == 0
Expand All @@ -179,19 +205,5 @@ function! rnvimr#init(...) abort
endif

let cmd = ranger_cmd . ' --confdir=' . confdir . ' --cmd=' . attach_cmd
call s:create_ranger(cmd, env)
augroup RnvimrTerm
autocmd!
autocmd VimResized <buffer> call s:redraw_win()
autocmd VimLeavePre * call rnvimr#rpc#destroy()
if get(g:, 'rnvimr_enable_bw', 0)
autocmd TermEnter,WinEnter <buffer> call rnvimr#context#check_point()
autocmd WinLeave <buffer> call rnvimr#context#buf_wipe()
endif
if s:shadow_winblend < 100 && s:shadow_winblend >= 0
autocmd TermEnter,WinEnter <buffer> call rnvimr#shadowwin#create(s:shadow_winblend)
autocmd WinLeave <buffer> call rnvimr#shadowwin#destroy()
autocmd VimResized <buffer> call rnvimr#shadowwin#reszie()
endif
augroup END
call s:create_ranger(cmd, env, is_background)
endfunction
4 changes: 4 additions & 0 deletions doc/rnvimr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,10 @@ COMMANDS *rnvimr-commands*
or multiple indexes separate by {,} such as {4,2,1,3}, it will circularly
iterate special elements of |g:rnvimr_presets| in order via index.

:RnvimrStartBackGround
Start Ranger in the background. The time of first toggling the Ranger
floating window will be greatly improved after called this command.

================================================================================

EXAMPLES *rnvimr-config-examples*
Expand Down
1 change: 1 addition & 0 deletions plugin/rnvimr.vim
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ let g:loaded_rnvimr = 1

command! -nargs=0 RnvimrToggle call rnvimr#toggle()
command! -nargs=* RnvimrResize call rnvimr#resize(<args>)
command! -nargs=0 RnvimrStartBackGround call rnvimr#init('', 1)

" TODO rnvimr_ex_enable was desperated.
let g:rnvimr_enable_ex = get(g:, 'rnvimr_enable_ex', 0) || get(g:, 'rnvimr_ex_enable', 0)
Expand Down

0 comments on commit 07689e9

Please sign in to comment.