Support primary clipboard #548

dsseng · 2021-08-04T05:51:29Z

Fixes #532

Also some refactoring is done for fallback

TODO:

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-view/src/clipboard.rs

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term/src/commands.rs

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

cessen · 2021-08-04T14:15:25Z

As I mentioned in #532 please make these behaviors disable-able in the config.

Although I do think we should support these behaviors for people who want them, it's also a behavior that really annoys some people (myself included). I actually go to great lengths to disable the behavior on my local Linux system, and having it hard-coded in Helix would subvert that in my now-primary editor.

I'm even fine having it enabled by default. I just want to be able to disable it in my config.

dsseng · 2021-08-04T14:17:56Z

Sure, I'll do that option now

helix-view/src/clipboard.rs

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term/src/config.rs

helix-term/src/ui/editor.rs

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng · 2021-08-05T15:27:02Z

I've decided not to use combined wl-copy + xsel, since it will still be inconvenient for those who do not use Xwayland and use on-demand start of it. Anyway, if somebody wants to change default provider, we should add some config option later.

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-view/src/clipboard.rs

helix-term/src/commands.rs

helix-term/src/ui/editor.rs

helix-term/src/application.rs

Co-authored-by: Gokul Soumya <gokulps15@gmail.com>

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

sudormrfbin

LGTM, and tested on linux.

archseer · 2021-08-11T01:59:54Z

helix-view/src/clipboard.rs

@@ -37,18 +69,24 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
        command_provider! {
            paste => "wl-paste", "--no-newline";
            copy => "wl-copy", "--type", "text/plain";
+            primary_paste => "wl-paste", "-p", "--no-newline";


Given that the config says middle_click_paste, I'd rename all references in this file from primary to middle_click too.

In terms of window systems (both X11 and Wayland) it's named primary selection, as well as in tools used for access to it. Config option is for UI actually, and we still have commands for accessing both clipboards, so setting actually disables mouse behavior (copy on select and paste on middle click), not the buffer.

CBenoit · 2021-08-11T12:42:31Z

helix-view/src/clipboard.rs

        }
    } else if env_var_is_set("DISPLAY") && exists("xsel") && is_exit_success("xsel", &["-o", "-b"])
    {
        // FIXME: check performance of is_exit_success
        command_provider! {
            paste => "xsel", "-o", "-b";
            copy => "xsel", "--nodetach", "-i", "-b";
+            primary_paste => "xsel", "-o";
+            primary_copy => "xsel", "-i";


Is there a reason why --nodetach is not used for the primary one?

I has a freeze with it (xsel stuck untill I killed it via system monitor). It works fine without --nodetach, not sure why it was necessary there. If I'm incorrect in removing that I can test it again and re-enable.

I don’t know exactly why, but they use it in neovim.
Exact command used is xsel --nodetach -i -p (-p is default as you know, so it’s identical except for the --nodetach).
IIRC this is related to stdin/out stuff, but if it works without, I guess it’s fine 🤷‍♂️

Should be okay. I'll leave this thread open for other reviewers.

@CBenoit I don't think all neovim's options are directly portable. I had issues with wl-copy --foreground for example since the command would never return and stall out: 994ff4b#diff-68b83255fe92299d6a62dcca53412b8976d5eda55d3640b4f0dcec474249ba27

cessen · 2021-08-12T22:55:49Z

How do I disable this in my config.toml? I can disable the entirety of mouse support like this:

[editor]
mouse = false

But middle_click_paste = false doesn't seem to do anything.

dsseng · 2021-08-13T05:01:02Z

@cessen they are renamed to kebab-case (#[serde(rename_all = "kebab-case", default)]), so use middle-click-paste = false.

cessen · 2021-08-13T16:22:58Z

@sh7dm Thanks!

dsseng added 9 commits August 4, 2021 08:47

clipboard-none: add in-memory fallback buffer

75fed68

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

view: add Wayland primary clipboard

2c20d35

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

Format

5b88151

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term: copy to primary selection after mouse move stops

8ccbe36

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term: don't update primary selection if it is a single character

c938a7b

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term: discard result of setting primary selection

684b8dc

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term: add commands for interaction with primary clipboard

71eb635

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

editor: implement primary selection copy/paste using commands

fb06c20

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

clipboard: support xsel for primary selection

74681bd

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng commented Aug 4, 2021

View reviewed changes

helix-view/src/clipboard.rs Outdated Show resolved Hide resolved

clipboard: support xclip for primary selection

f898fad

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

sudormrfbin reviewed Aug 4, 2021

View reviewed changes

helix-term/src/commands.rs Outdated Show resolved Hide resolved

helix-term: multiple cursor support for middle click paste

19f6c94

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng marked this pull request as ready for review August 4, 2021 11:06

rename primary selection to primary clipboard in scope of PR

05ae650

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng changed the title ~~Support primary selection~~ Support primary clipboard Aug 4, 2021

sudormrfbin reviewed Aug 4, 2021

View reviewed changes

helix-view/src/clipboard.rs Outdated Show resolved Hide resolved

dsseng added 2 commits August 4, 2021 17:37

helix-term: make middle click paste optional

1e8162e

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

Format

db0d5d5

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

pickfire reviewed Aug 5, 2021

View reviewed changes

helix-term/src/config.rs Outdated Show resolved Hide resolved

pickfire reviewed Aug 5, 2021

View reviewed changes

helix-term/src/ui/editor.rs Outdated Show resolved Hide resolved

dsseng commented Aug 5, 2021

View reviewed changes

helix-term/src/ui/editor.rs Outdated Show resolved Hide resolved

dsseng added 3 commits August 5, 2021 14:11

Update helix-term/src/ui/editor.rs

b273396

fix formatting

ffef3ea

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

config: correct defaults if terminal prop is not set

b76b8e7

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng added 2 commits August 5, 2021 18:29

refactor: merge clipboard and primary selection implementations

2316230

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

Merge branch 'master' into primary-clipboard

d16eab4

view: remove names for different clipboard/selection providers

ada6b9d

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng requested review from pickfire and sudormrfbin August 5, 2021 15:51

sudormrfbin reviewed Aug 6, 2021

View reviewed changes

helix-view/src/clipboard.rs Outdated Show resolved Hide resolved

helix-view/src/clipboard.rs Outdated Show resolved Hide resolved

helix-view/src/clipboard.rs Outdated Show resolved Hide resolved

sudormrfbin reviewed Aug 6, 2021

View reviewed changes

helix-term/src/commands.rs Outdated Show resolved Hide resolved

helix-term/src/ui/editor.rs Outdated Show resolved Hide resolved

dsseng commented Aug 7, 2021

View reviewed changes

helix-term/src/application.rs Outdated Show resolved Hide resolved

dsseng and others added 9 commits August 7, 2021 15:45

Update helix-view/src/clipboard.rs

a530f88

Co-authored-by: Gokul Soumya <gokulps15@gmail.com>

helix-view: tidy macros

b363b0b

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

helix-term: refactor paste-replace commands

7e82895

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

Merge branch 'master' into primary-clipboard

bded2fd

helix-term: use new config for middle-click-paste

9294835

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

clipboard: remove memory fallback for command and windows providers

13c8a0c

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

clipboard-win: fix build

cbd58f1

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

clipboard: return empty string when primary clipboard is missing

79a79c5

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

clipboard: fix errors in Windows build

5ba6241

Signed-off-by: Dmitry Sharshakov <d3dx12.xx@gmail.com>

dsseng requested a review from sudormrfbin August 8, 2021 11:37

Merge branch 'master' into primary-clipboard

7fbc25a

sudormrfbin assigned sudormrfbin and unassigned sudormrfbin Aug 10, 2021

sudormrfbin approved these changes Aug 10, 2021

View reviewed changes

archseer requested review from cessen and CBenoit August 11, 2021 01:58

archseer reviewed Aug 11, 2021

View reviewed changes

CBenoit reviewed Aug 11, 2021

View reviewed changes

archseer approved these changes Aug 12, 2021

View reviewed changes

archseer merged commit 7d51805 into helix-editor:master Aug 12, 2021

dsseng deleted the primary-clipboard branch August 12, 2021 04:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support primary clipboard #548

Support primary clipboard #548

dsseng commented Aug 4, 2021 •

edited

Loading

cessen commented Aug 4, 2021

dsseng commented Aug 4, 2021

dsseng commented Aug 5, 2021

sudormrfbin left a comment

archseer Aug 11, 2021

dsseng Aug 11, 2021

CBenoit Aug 11, 2021

dsseng Aug 11, 2021

CBenoit Aug 11, 2021 •

edited

Loading

dsseng Aug 11, 2021

archseer Aug 11, 2021

cessen commented Aug 12, 2021

dsseng commented Aug 13, 2021

cessen commented Aug 13, 2021

Support primary clipboard #548

Support primary clipboard #548

Conversation

dsseng commented Aug 4, 2021 • edited Loading

TODO:

cessen commented Aug 4, 2021

dsseng commented Aug 4, 2021

dsseng commented Aug 5, 2021

sudormrfbin left a comment

Choose a reason for hiding this comment

archseer Aug 11, 2021

Choose a reason for hiding this comment

dsseng Aug 11, 2021

Choose a reason for hiding this comment

CBenoit Aug 11, 2021

Choose a reason for hiding this comment

dsseng Aug 11, 2021

Choose a reason for hiding this comment

CBenoit Aug 11, 2021 • edited Loading

Choose a reason for hiding this comment

dsseng Aug 11, 2021

Choose a reason for hiding this comment

archseer Aug 11, 2021

Choose a reason for hiding this comment

cessen commented Aug 12, 2021

dsseng commented Aug 13, 2021

cessen commented Aug 13, 2021

dsseng commented Aug 4, 2021 •

edited

Loading

CBenoit Aug 11, 2021 •

edited

Loading