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

Merge pull request #282 from go-vgo/op-pr

Browse Source 
add paste string err return and optimize code
This commit is contained in:
vz 2020-08-09 08:44:29 -04:00 committed by GitHub
commit 8ea6d8e59d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hook.go
View File

@ -60,7 +60,6 @@ func EventProcess(Events chan hook.Event) chan bool {
// EventHook register gohook event // EventHook register gohook event
func EventHook(When uint8, keysPressed []string, Callback func(hook.Event)) { func EventHook(When uint8, keysPressed []string, Callback func(hook.Event)) {
hook.Register(When, keysPressed, Callback) hook.Register(When, keysPressed, Callback)
return
} }
// AddEvent add event listener, // AddEvent add event listener,
@ -92,12 +91,7 @@ func AddEvent(key string) bool {
geve := hook.AddEvent(key) geve := hook.AddEvent(key)
// defer C.free(unsafe.Pointer(cs)) // defer C.free(unsafe.Pointer(cs))
return geve == 0
if geve == 0 {
return true
}
return false
} }
// AddEvents add global event hook // AddEvents add global event hook

16
robotgo.go
View File

@ -49,8 +49,9 @@ package robotgo
import "C" import "C"
import ( import (
// "fmt" "fmt"
"image" "image"
// "os" // "os"
"reflect" "reflect"
"runtime" "runtime"
@ -577,9 +578,9 @@ func KeyTap(tapKey string, args ...interface{}) string {
num int num int
keyDelay = 10 keyDelay = 10
) )
// var ckeyArr []*C.char // var ckeyArr []*C.char
ckeyArr := make([](*C.char), 0) ckeyArr := make([](*C.char), 0)
// zkey := C.CString(args[0]) // zkey := C.CString(args[0])
zkey := C.CString(tapKey) zkey := C.CString(tapKey)
defer C.free(unsafe.Pointer(zkey)) defer C.free(unsafe.Pointer(zkey))
@ -591,8 +592,8 @@ func KeyTap(tapKey string, args ...interface{}) string {
ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(s)))) ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(s))))
} }
str := C.key_Taps(zkey, (**C.char)(unsafe.Pointer(&ckeyArr[0])), str := C.key_Taps(zkey,
C.int(num), 0) (**C.char)(unsafe.Pointer(&ckeyArr[0])), C.int(num), 0)
return C.GoString(str) return C.GoString(str)
} }
@ -601,7 +602,6 @@ func KeyTap(tapKey string, args ...interface{}) string {
keyArr = args[0].([]string) keyArr = args[0].([]string)
num = len(keyArr) num = len(keyArr)
for i := 0; i < num; i++ { for i := 0; i < num; i++ {
ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(keyArr[i])))) ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(keyArr[i]))))
} }
@ -789,7 +789,11 @@ func TypeStr(str string, args ...float64) {
// PasteStr paste a string, support UTF-8 // PasteStr paste a string, support UTF-8
func PasteStr(str string) string { func PasteStr(str string) string {
clipboard.WriteAll(str) err := clipboard.WriteAll(str)
if err != nil {
return fmt.Sprint(err)
}
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
return KeyTap("v", "command") return KeyTap("v", "command")
} }