longpeng/robotgo
1
0
Fork 0
mirror of https://github.com/go-vgo/robotgo.git synced 2025-06-20 06:43:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update clipboard code

Browse Source
This commit is contained in:
vcaesar 2020-08-06 12:20:03 -04:00
parent fbfe90a5d6
commit 27a8e625cd
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clipboard/clipboard_darwin.go
View File

@ -48,5 +48,6 @@ func writeAll(text string) error {
if err := in.Close(); err != nil { if err := in.Close(); err != nil {
return err return err
} }
return copyCmd.Wait() return copyCmd.Wait()
} }

3
clipboard/clipboard_unix.go
View File

@ -67,11 +67,13 @@ func readAll() (string, error) {
if Unsupported { if Unsupported {
return "", errMissingCommands return "", errMissingCommands
} }
pasteCmd := getPasteCommand() pasteCmd := getPasteCommand()
out, err := pasteCmd.Output() out, err := pasteCmd.Output()
if err != nil { if err != nil {
return "", err return "", err
} }
return string(out), nil return string(out), nil
} }
@ -94,5 +96,6 @@ func writeAll(text string) error {
if err := in.Close(); err != nil { if err := in.Close(); err != nil {
return err return err
} }
return copyCmd.Wait() return copyCmd.Wait()
} }

7
clipboard/clipboard_windows.go
View File

@ -38,8 +38,10 @@ var (
func waitOpenClipboard() error { func waitOpenClipboard() error {
started := time.Now() started := time.Now()
limit := started.Add(time.Second) limit := started.Add(time.Second)
var r uintptr var (
var err error r uintptr
err error
)
for time.Now().Before(limit) { for time.Now().Before(limit) {
r, _, err = openClipboard.Call(0) r, _, err = openClipboard.Call(0)
if r != 0 { if r != 0 {
@ -47,6 +49,7 @@ func waitOpenClipboard() error {
} }
time.Sleep(time.Millisecond) time.Sleep(time.Millisecond)
} }
return err return err
} }