IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

clipboard: support separate '+' and '*' clipboards

Browse Source
This commit is contained in:
Björn Linse 2014-11-22 16:01:14 +01:00
parent 8fc710110f
commit c1854d2433
3 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
runtime/autoload/provider/clipboard.vim
View File

@ -1,8 +1,8 @@
" The clipboard provider uses shell commands to communicate with the clipboard. " The clipboard provider uses shell commands to communicate with the clipboard.
" The provider function will only be registered if one of the supported " The provider function will only be registered if one of the supported
" commands are available. " commands are available.
let s:copy = '' let s:copy = {}
let s:paste = '' let s:paste = {}
function! s:try_cmd(cmd, ...) function! s:try_cmd(cmd, ...)
let out = a:0 ? systemlist(a:cmd, a:1) : systemlist(a:cmd) let out = a:0 ? systemlist(a:cmd, a:1) : systemlist(a:cmd)
@ -14,14 +14,20 @@ function! s:try_cmd(cmd, ...)
endfunction endfunction
if executable('pbcopy') if executable('pbcopy')
let s:copy = 'pbcopy' let s:copy['+'] = 'pbcopy'
let s:paste = 'pbpaste' let s:paste['+'] = 'pbpaste'
elseif executable('xsel') let s:copy['*'] = s:copy['+']
let s:copy = 'xsel -i -b' let s:paste['*'] = s:paste['+']
let s:paste = 'xsel -o -b'
elseif executable('xclip') elseif executable('xclip')
let s:copy = 'xclip -i -selection clipboard' let s:copy['+'] = 'xclip -i -selection clipboard'
let s:paste = 'xclip -o -selection clipboard' let s:paste['+'] = 'xclip -o -selection clipboard'
let s:copy['*'] = 'xclip -i -selection primary'
let s:paste['*'] = 'xclip -o -selection primary'
elseif executable('xsel')
let s:copy['+'] = 'xsel -i -b'
let s:paste['+'] = 'xsel -o -b'
let s:copy['*'] = 'xsel -i -p'
let s:paste['*'] = 'xsel -o -p'
else else
echom 'clipboard: No shell command for communicating with the clipboard found.' echom 'clipboard: No shell command for communicating with the clipboard found.'
finish finish
@ -29,14 +35,14 @@ endif
let s:clipboard = {} let s:clipboard = {}
function! s:clipboard.get(...) function! s:clipboard.get(reg)
return s:try_cmd(s:paste) return s:try_cmd(s:paste[a:reg])
endfunction endfunction
function! s:clipboard.set(...) function! s:clipboard.set(lines, reg)
call s:try_cmd(s:copy, a:1) call s:try_cmd(s:copy[a:reg], a:lines)
endfunction endfunction
function! provider#clipboard#Call(method, args) function! provider#clipboard#Call(method, args)
return s:clipboard[a:method](a:args) return call(s:clipboard[a:method],a:args,s:clipboard)
endfunction endfunction

14
src/nvim/eval.c
View File

@ -5118,6 +5118,20 @@ void list_append_tv(list_T *l, typval_T *tv)
list_append(l, li); list_append(l, li);
} }
/*
* Add a list to a list.
*/
void list_append_list(list_T *list, list_T *itemlist)
{
listitem_T *li = listitem_alloc();
li->li_tv.v_type = VAR_LIST;
li->li_tv.v_lock = 0;
li->li_tv.vval.v_list = itemlist;
list_append(list, li);
++list->lv_refcount;
}
/* /*
* Add a dictionary to a list. Used by getqflist(). * Add a dictionary to a list. Used by getqflist().
*/ */

13
src/nvim/ops.c
View File

@ -5244,7 +5244,11 @@ static void get_clipboard(int name)
struct yankreg *reg = &y_regs[CLIP_REGISTER]; struct yankreg *reg = &y_regs[CLIP_REGISTER];
free_register(reg); free_register(reg);
list_T *args = list_alloc(); list_T *args = list_alloc();
char_u regname = (char_u)name;
list_append_string(args, &regname, 1);
typval_T result = eval_call_provider("clipboard", "get", args); typval_T result = eval_call_provider("clipboard", "get", args);
if (result.v_type != VAR_LIST) { if (result.v_type != VAR_LIST) {
@ -5294,6 +5298,7 @@ static void set_clipboard(int name)
if (!name && p_unc) { if (!name && p_unc) {
// copy from the unnamed register // copy from the unnamed register
copy_register(reg, &y_regs[0]); copy_register(reg, &y_regs[0]);
name = '+';
} }
list_T *lines = list_alloc(); list_T *lines = list_alloc();
@ -5302,5 +5307,11 @@ static void set_clipboard(int name)
list_append_string(lines, reg->y_array[i], -1); list_append_string(lines, reg->y_array[i], -1);
} }
(void)eval_call_provider("clipboard", "set", lines); list_T *args = list_alloc();
list_append_list(args, lines);
char_u regname = (char_u)name;
list_append_string(args, &regname, 1);
(void)eval_call_provider("clipboard", "set", args);
} }