Skip to content

interactiveutil: clipboard for FreeBSD #23151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefanKarpinski merged 2 commits into from
Dec 16, 2017
Merged

interactiveutil: clipboard for FreeBSD #23151

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29e0279
interactiveutil: clipboard for FreeBSD
iblislin Aug 6, 2017
7383081
interactiveutil: not repeat xclip command
iblislin Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 36 additions & 6 deletions base/interactiveutil.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,30 +134,60 @@ if Sys.isapple()
end
clipboard() = read(`pbpaste`, String)

elseif Sys.islinux()
elseif Sys.islinux() || Sys.KERNEL === :FreeBSD
_clipboardcmd = nothing
const _clipboardcmds = if Sys.islinux()
Dict(
:copy => Dict(
:xsel => `xsel --nodetach --input --clipboard`,
:xclip => `xclip -silent -in -selection clipboard`,
),
:paste => Dict(
:xsel => `xsel --nodetach --output --clipboard`,
:xclip => `xclip -quiet -out -selection clipboard`,
)
)
elseif Sys.KERNEL === :FreeBSD
Dict(
:copy => Dict(
:xsel => `xsel -c`,
:xclip => `xclip -silent -in -selection clipboard`,
),
:paste => Dict(
:xsel => `xsel -p`,
:xclip => `xclip -quiet -out -selection clipboard`,
)
)
end
Copy link
Member

@ararslan ararslan Aug 6, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the only difference is in the options passed to xsel, I think it might be cleaner to just separate that part, i.e something like

xsel_copy  = Sys.islinux() ? `xsel --nodetach --input --clipboard`  : `xsel -c`
xsel_paste = Sys.islinux() ? `xsel --nodetach --output --clipboard` : `xsel -p`

_clipboardcmds = Dict(:copy  => Dict(:xsel  => xsel_copy,
                                     :xclip => `xclip -silent -in -selection clipboard`),
                      :paste => Dict(:xsel  => xsel_paste,
                                     :xclip => `xclip -quiet -out -selection clipboard`))

function clipboardcmd()
global _clipboardcmd
_clipboardcmd !== nothing && return _clipboardcmd
for cmd in (:xclip, :xsel)
success(pipeline(`which $cmd`, DevNull)) && return _clipboardcmd = cmd
Copy link
Contributor

@tkelman tkelman Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-existing, but this'll give a pretty misleading error message if which isn't installed

Copy link
Member Author

@iblislin iblislin Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or... we can implement a simple version of which in Julia?

Copy link
Contributor

@tkelman tkelman Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I generally do is if I know the program I'm looking for, usually there's a safe no-op flag like -h or --version that you can try executing in a try-catch.

Copy link
Member Author

@iblislin iblislin Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-h works on xclip. unfortunately, the bsd version xsel doesn't have any no-op flag.

end
error("no clipboard command found, please install xsel or xclip")
pkgs = @static if Sys.islinux()
"xsel or xclip"
elseif Sys.KERNEL === :FreeBSD
Copy link
Contributor

@tkelman tkelman Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think @static will resolve the elseif yet

Copy link
Member Author

@iblislin iblislin Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems works... is it expected?

julia> @static if true
         42
       elseif false
         24
       end                                                                                                            
42                                                                                                                    
                                                                                                                      
julia> @static if false
         42
       elseif true
         24
       end                                                                                                            
24

Copy link
Contributor

@tkelman tkelman Aug 7, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but the elseif condition is getting evaluated at run time, I believe

Copy link
Member Author

@iblislin iblislin Dec 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

support of elseif block is added in #24787

"x11/xsel or x11/xclip"
end
error("no clipboard command found, please install $pkgs")
end
function clipboard(x)
c = clipboardcmd()
cmd = c == :xsel ? `xsel --nodetach --input --clipboard` :
c == :xclip ? `xclip -silent -in -selection clipboard` :
cmd = get(_clipboardcmds[:copy], c, nothing)
if cmd === nothing
error("unexpected clipboard command: $c")
end
open(pipeline(cmd, stderr=STDERR), "w") do io
print(io, x)
end
end
function clipboard()
c = clipboardcmd()
cmd = c == :xsel ? `xsel --nodetach --output --clipboard` :
c == :xclip ? `xclip -quiet -out -selection clipboard` :
cmd = get(_clipboardcmds[:paste], c, nothing)
if cmd === nothing
error("unexpected clipboard command: $c")
end
read(pipeline(cmd, stderr=STDERR), String)
end

Expand Down