fix keytap some error and fmt code

This commit is contained in:
vcaesar 2017-12-24 02:07:41 +08:00
parent 214ac59298
commit 883e9c24a9

View File

@ -62,7 +62,7 @@ import (
) )
const ( const (
version string = "v0.47.0.448, Mount Cook!" version string = "v0.47.0.449, Mount Cook!"
) )
type ( type (
@ -125,7 +125,7 @@ func GetPxColor(x, y int) C.MMRGBHex {
func GetPixelColor(x, y int) string { func GetPixelColor(x, y int) string {
cx := C.size_t(x) cx := C.size_t(x)
cy := C.size_t(y) cy := C.size_t(y)
color := C.aGetPixelColor(cx, cy) color := C.aGetPixelColor(cx, cy)
// color := C.aGetPixelColor(x, y) // color := C.aGetPixelColor(x, y)
gcolor := C.GoString(color) gcolor := C.GoString(color)
@ -488,10 +488,10 @@ func ScrollMouse(x int, y string) {
// https://github.com/go-vgo/robotgo/blob/master/docs/keys.md // https://github.com/go-vgo/robotgo/blob/master/docs/keys.md
func KeyTap(args ...interface{}) { func KeyTap(args ...interface{}) {
var ( var (
akey string akey string
keyT = "null" keyT = "null"
keyArr []string keyArr []string
num int num int
keyDelay = 10 keyDelay = 10
) )
// var ckeyArr []*C.char // var ckeyArr []*C.char
@ -508,16 +508,18 @@ func KeyTap(args ...interface{}) {
ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(keyArr[i])))) ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(keyArr[i]))))
} }
if len(args) > 3 { if len(args) > 2 {
keyDelay = args[2].(int) keyDelay = args[2].(int)
} }
} else { } else {
akey = args[1].(string) akey = args[1].(string)
if reflect.TypeOf(args[2]) == reflect.TypeOf(akey) { if len(args) > 2 {
keyT = args[2].(string) if reflect.TypeOf(args[2]) == reflect.TypeOf(akey) {
} else { keyT = args[2].(string)
keyDelay = args[2].(int) } else {
keyDelay = args[2].(int)
}
} }
} }
@ -531,8 +533,8 @@ func KeyTap(args ...interface{}) {
zkey := C.CString(args[0].(string)) zkey := C.CString(args[0].(string))
if akey == "" && len(keyArr) != 0 { if akey == "" && len(keyArr) != 0 {
C.key_Tap(zkey, (**_Ctype_char)(unsafe.Pointer(&ckeyArr[0])), C.key_Tap(zkey, (**_Ctype_char)(unsafe.Pointer(&ckeyArr[0])),
C.int(num),C.int(keyDelay)) C.int(num), C.int(keyDelay))
} else { } else {
// zkey := C.CString(args[0]) // zkey := C.CString(args[0])
amod := C.CString(akey) amod := C.CString(akey)
@ -553,9 +555,9 @@ func KeyTap(args ...interface{}) {
// https://github.com/go-vgo/robotgo/blob/master/docs/keys.md // https://github.com/go-vgo/robotgo/blob/master/docs/keys.md
func KeyToggle(args ...string) string { func KeyToggle(args ...string) string {
var ( var (
adown string adown string
amkey string amkey string
mKeyT string mKeyT string
keyDelay = 10 keyDelay = 10
) )