[RFC] provider/clipboard: allow configuration #6030

nhooyr · 2017-01-30T02:59:34Z

Closes #6029
Closes #6658

nhooyr · 2017-01-30T03:40:30Z

Tested on my server, looks good.

tweekmonster · 2017-01-30T05:19:03Z

The script still looks a little rigid for something that's supposed to be configurable. Couldn't each clipboard executable be in a list?

  let s:defaults = [
        \   {
        \     'cmd': ['pbcopy', 'pbpaste'],
        \   },
        \   {
        \     'cmd': 'xsel',
        \     'check': function('s:check_xsel'),
        \     '+': ['--nodetach -i -b', '-o -b'],
        \     '*': ['--nodetach -i -p', '-o -p'],
        \   },
        \   ...
        \ ]

Then iterate over the list to find the first available cmd. If the user has g:clipboard_providers (also a list), it's checked first before falling back to the default list. This way, the user could just use a memcached server or something (nc in your case) without needing to fool the provider script.

nhooyr · 2017-01-30T05:40:12Z

Ah, good point, I'll do that tomorrow.

nhooyr · 2017-01-31T03:49:15Z

Ok, done! 🎉

edit: jk

nhooyr · 2017-01-31T04:00:37Z

runtime/autoload/provider/clipboard.vim

+      \      '*': 'pbpaste',
+      \   },
+      \   'cache_enabled': 0,
+      \   'check': "executable('pbcopy')",


I intentionally removed the has('mac') check from here because now that it is configurable, we don't need to check it. If someone has pbcopy on a non-mac os, and it does not do clipboard pasting/copying properly, they should just configure whatever they need themselves.

nhooyr · 2017-01-31T04:04:21Z

Alright, done for now.

tweekmonster

Looks good to me.

I think it's a little weird that there's so much repetition with the command names. pbcopy + pbpaste seem to be the only one that require this. I wouldn't block this PR over it, though.

nhooyr · 2017-01-31T04:21:26Z

Alright cool, I just noticed a small mistake; I accidentally deleted a line. Added it back.

This function also had incorrect behaviour that is now fixed.

Shougo · 2017-06-23T11:07:24Z

What is the status?

nhooyr · 2017-06-23T11:11:25Z

Nothing so far. I have an exam today and then I am free for the holidays. I'll fix it up then.

nhooyr · 2017-06-26T06:43:24Z

Updated :)

justinmk · 2017-06-26T23:57:36Z

would prefer to avoid the churn. Is it really needed to move most of the code?

justinmk · 2017-06-26T23:58:28Z

runtime/autoload/provider/clipboard.vim

+    let s:paste = a:p.paste
+    let s:cache_enabled = a:p.cache_enabled
+    return a:p.name
+endfunction


this isn't actually saving lines since the dictionary definition ends up being 50% bigger. So the churn isn't worth it.

justinmk · 2017-06-26T23:59:17Z

runtime/autoload/provider/clipboard.vim

-    let s:copy['*'] = s:copy['+']
-    let s:paste['*'] = s:paste['+']
-    return 'tmux'
+  if exists('g:clipboard_provider')


just check this before the above lines.

nhooyr · 2017-06-27T02:25:15Z

I didn't indent to save lines. I wanted a homogenous way of handling both external and internal clipboard providers. In addition, I think it's a lot easier to read the list of dictionaries than the chain of if else statements.

Since you want to avoid the churn though, I'll update this PR in a few hours and remove it.

nhooyr · 2017-06-27T05:51:57Z

Done.

chrisbra · 2017-06-27T06:18:30Z

runtime/autoload/provider/clipboard.vim

-
-function! s:set_provider(p) abort
+function! provider#clipboard#Executable() abort
+  if exists('g:clipboard_provider')
    let s:copy = a:p.copy
    let s:paste = a:p.paste
    let s:cache_enabled = a:p.cache_enabled
    return a:p.name


what is a:p?

argh, copy paste error

justinmk · 2017-06-27T07:29:04Z

Thanks @nhooyr . One last thing, let's rename it to g:clipboard_prog in analogy with g:python_host_prog, 'equalprg', etc. "Provider" is more the name for the abstraction: changing the provider would entail changing autoload/provider/clipboard.vim (which is something we support).

nhooyr · 2017-06-27T07:33:20Z

Ok done. Do you want me to clean up the commit history by turning it into a single commit or can you do that and merge?

justinmk · 2017-06-27T07:48:00Z

I'll squash it. Actually the name could be g:clipboard since it's a dictionary of options, there won't be any other g:clipboard_foo things. Though that's confusing since there is also a 'clipboard' option. Ideally we would turn 'clipboard' option into a dictionary option, but that's out of scope...

nhooyr · 2017-06-27T07:50:13Z

Ok, updated.

justinmk · 2017-06-28T07:54:39Z

Merged. Thanks @nhooyr

Closes #6029

FEATURES: 0e873a3 Lua(Jit) built-in neovim#4411 5b32bce Windows: `:terminal` neovim#7007 7b0ceb3 UI/API: externalize cmdline neovim#7173 b67f58b UI/API: externalize wildmenu neovim#7454 b23aa1c UI: 'winhighlight' neovim#6597 17531ed UI: command-line coloring (`:help input()-highlight`) neovim#6364 244a1f9 API: execute lua directly from the remote api neovim#6704 45626de API: `get_keymap()` neovim#6236 db99982 API: `nvim_get_hl_by_name()`, `nvim_get_hl_by_id()` neovim#7082 dc68538 menu_get() function neovim#6322 9db42d4 :cquit : take an error code argument neovim#7336 9cc185d job-control: serverstart(): support ipv6 neovim#6680 1b7a9bf job-control: sockopen() neovim#6594 6efe84a clipboard: fallback to tmux clipboard neovim#6894 6016ac2 clipboard: customize clipboard with `g:clipboard` neovim#6030 3a86dd5 ruby: override ruby host via `g:ruby_host_prog` neovim#6841 16cce1a debug: $NVIM_LOG_FILE neovim#6827 0cba3da `:checkhealth` built-in, validates $VIMRUNTIME neovim#7399 FIXES: 105d680 TUI: more terminals, improve scroll/resize neovim#6816 cb912a3 :terminal : handle F1-F12, other keys neovim#7241 619838f inccommand: improve performance neovim#6949 04b3c32 inccommand: Fix matches for zero-width neovim#7487 60b1e8a inccommand: multiline, other fixes neovim#7315 f1f7f3b inccommand: Ignore leading modifiers in the command neovim#6967 1551f71 inccommand: fix 'gdefault' lockup neovim#7262 6338199 API: bufhl: support creating new groups neovim#7414 541dde3 API: allow K_EVENT during operator-pending 8c732f7 terminal: adjust for 'number' neovim#7440 5bec946 UI: preserve wildmenu during jobs/events neovim#7110 c349083 UI: disable 'lazyredraw' during ui_refresh. neovim#6259 51808a2 send FocusGained/FocusLost event instead of pseudokey neovim#7221 133f8bc shada: preserve unnamed register on restart neovim#4700 1b70a1d shada: avoid assertion on corrupt shada file neovim#6958 9f534f3 mksession: Restore tab-local working directory neovim#6859 de1084f fix buf_write() crash neovim#7140 7f76986 syntax: register 'Normal' highlight group neovim#6973 6e7a8c3 RPC: close channel if stream was closed neovim#7081 85f3084 clipboard: disallow recursion; show hint only once neovim#7203 8d1ccb6 clipboard: performance, avoid weird edge-cases neovim#7193 01487d4 'titleold' neovim#7358 01e53a5 Windows: better path-handling, separator (slash) hygiene neovim#7349 0f2873c Windows: multibyte startup arguments neovim#7060 CHANGES: 9ff0cc7 :terminal : start in normal-mode neovim#6808 032b088 lower priority of 'cursorcolumn', 'colorcolumn' neovim#7364 2a3bcd1 RPC: Don't delay notifications when request is pending neovim#6544 023f67c :terminal : Do not change 'number', 'relativenumber' neovim#6796 1ef2d76 socket.c: Disable Nagle's algorithm on TCP sockets neovim#6915 6720fe2 help: `K` tries Vim help instead of manpage neovim#3104 7068370 help, man.vim: change "outline" map to `gO` neovim#7405

provider/clipboard.vim: allow configuration of clipboard executable

aaa80cb

Closes #6029

nhooyr changed the title ~~provider/clipboard.vim: allow configuration of clipboard executable~~ [WIP] provider/clipboard.vim: allow configuration of clipboard executable Jan 31, 2017

marvim added the WIP label Jan 31, 2017

provider/clipboard.vim: less rigid provider configuration

5faa005

nhooyr changed the title ~~[WIP] provider/clipboard.vim: allow configuration of clipboard executable~~ [RFC] provider/clipboard.vim: allow configuration of clipboard executable Jan 31, 2017

nhooyr commented Jan 31, 2017

View reviewed changes

marvim added RFC and removed WIP labels Jan 31, 2017

tweekmonster approved these changes Jan 31, 2017

View reviewed changes

nhooyr changed the title ~~[RFC] provider/clipboard.vim: allow configuration of clipboard executable~~ [RFC] provider/clipboard: allow configuration of clipboard executable Jan 31, 2017

nhooyr changed the title ~~[RFC] provider/clipboard: allow configuration of clipboard executable~~ [RFC] provider/clipboard: allow configuration of clipboard provider Jan 31, 2017

nhooyr changed the title ~~[RFC] provider/clipboard: allow configuration of clipboard provider~~ [RFC] provider/clipboard: allow configuration Jan 31, 2017

nhooyr added 3 commits January 31, 2017 11:08

provider/clipboard.vim: cleaner default providers

e5a1e44

docs/provider.txt: clipboard provider cache clarification

a351f42

provider/clipboard.vim: simpler s:set_provider

548b657

This function also had incorrect behaviour that is now fixed.

stephenprater mentioned this pull request Feb 4, 2017

Support for Custom Clipboard Programs #6055

Closed

This was referenced Apr 27, 2017

Allow remote UIs to manage system clipboards #6603

Closed

Always prefer win32yank on Windows #6658

Closed

equalsraf mentioned this pull request Jun 23, 2017

Integrate the clipboard provider into Neovim-Qt equalsraf/neovim-qt#298

Open

Merge branch 'master' into HEAD

892e184

justinmk reviewed Jun 26, 2017

View reviewed changes

chrisbra reviewed Jun 27, 2017

View reviewed changes

revert list of dictionaries for standard clipboard providers

8c801ea

clipboard.vim: rename g:clipboard_provider to g:clipboard_prog

b9694cc

clipboard.vim: rename g:clipboard_prog to g:clipboard

5bd6ed0

justinmk closed this Jun 28, 2017

justinmk removed the RFC label Jun 28, 2017

justinmk added a commit that referenced this pull request Jun 28, 2017

provider/clipboard.vim: allow configuration #6030

6016ac2

Closes #6029

Shougo mentioned this pull request Jun 28, 2017

clipboard support dzhou121/gonvim#46

Open

justinmk mentioned this pull request Jul 6, 2017

better support for user defined clipboards (like tmux buffer integration) #3948

Closed

justinmk mentioned this pull request Nov 8, 2017

NVIM v0.2.1 #7505

Merged

Uh oh!

[RFC] provider/clipboard: allow configuration #6030

[RFC] provider/clipboard: allow configuration #6030

Uh oh!

Conversation

nhooyr commented Jan 30, 2017 • edited by justinmk Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nhooyr commented Jan 30, 2017

Uh oh!

tweekmonster commented Jan 30, 2017

Uh oh!

nhooyr commented Jan 30, 2017

Uh oh!

nhooyr commented Jan 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nhooyr Jan 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nhooyr commented Jan 31, 2017

Uh oh!

tweekmonster left a comment

Choose a reason for hiding this comment

Uh oh!

nhooyr commented Jan 31, 2017

Uh oh!

Shougo commented Jun 23, 2017

Uh oh!

nhooyr commented Jun 23, 2017

Uh oh!

nhooyr commented Jun 26, 2017

Uh oh!

justinmk commented Jun 26, 2017

Uh oh!

justinmk Jun 26, 2017

Choose a reason for hiding this comment

Uh oh!

justinmk Jun 26, 2017

Choose a reason for hiding this comment

Uh oh!

nhooyr commented Jun 27, 2017

Uh oh!

nhooyr commented Jun 27, 2017

Uh oh!

chrisbra Jun 27, 2017

Choose a reason for hiding this comment

Uh oh!

nhooyr Jun 27, 2017

Choose a reason for hiding this comment

Uh oh!

justinmk commented Jun 27, 2017

Uh oh!

nhooyr commented Jun 27, 2017

Uh oh!

justinmk commented Jun 27, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nhooyr commented Jun 27, 2017

Uh oh!

justinmk commented Jun 28, 2017

Uh oh!

Uh oh!

nhooyr commented Jan 30, 2017 •

edited by justinmk

Loading

nhooyr commented Jan 31, 2017 •

edited

Loading

nhooyr Jan 31, 2017 •

edited

Loading

justinmk commented Jun 27, 2017 •

edited

Loading