update code and update some name

This commit is contained in:
vcaesar 2018-04-30 23:38:34 +08:00
parent 08341cc1aa
commit 1f95f5f2ae

View File

@ -629,7 +629,7 @@ func KeyTap(args ...interface{}) {
func KeyToggle(args ...string) string { func KeyToggle(args ...string) string {
var ( var (
adown string adown string
amkey string mKey string
mKeyT string mKeyT string
// keyDelay = 10 // keyDelay = 10
) )
@ -638,7 +638,7 @@ func KeyToggle(args ...string) string {
adown = args[1] adown = args[1]
if len(args) > 2 { if len(args) > 2 {
amkey = args[2] mKey = args[2]
if len(args) > 3 { if len(args) > 3 {
mKeyT = args[3] mKeyT = args[3]
@ -646,7 +646,7 @@ func KeyToggle(args ...string) string {
mKeyT = "null" mKeyT = "null"
} }
} else { } else {
amkey = "null" mKey = "null"
} }
} else { } else {
adown = "null" adown = "null"
@ -654,16 +654,16 @@ func KeyToggle(args ...string) string {
ckey := C.CString(args[0]) ckey := C.CString(args[0])
cadown := C.CString(adown) cadown := C.CString(adown)
camkey := C.CString(amkey) cmKey := C.CString(mKey)
cmKeyT := C.CString(mKeyT) cmKeyT := C.CString(mKeyT)
// defer func() { // defer func() {
str := C.key_toggle(ckey, cadown, camkey, cmKeyT) str := C.key_toggle(ckey, cadown, cmKey, cmKeyT)
// str := C.key_Toggle(ckey, cadown, camkey, cmKeyT, C.int(keyDelay)) // str := C.key_Toggle(ckey, cadown, cmKey, cmKeyT, C.int(keyDelay))
// fmt.Println(str) // fmt.Println(str)
// }() // }()
defer C.free(unsafe.Pointer(ckey)) defer C.free(unsafe.Pointer(ckey))
defer C.free(unsafe.Pointer(cadown)) defer C.free(unsafe.Pointer(cadown))
defer C.free(unsafe.Pointer(camkey)) defer C.free(unsafe.Pointer(cmKey))
defer C.free(unsafe.Pointer(cmKeyT)) defer C.free(unsafe.Pointer(cmKeyT))
return C.GoString(str) return C.GoString(str)
@ -1088,13 +1088,19 @@ func ReadBitmap(bitmap C.MMBitmapRef) bool {
return gbool return gbool
} }
// CopyBitpb copy bitmap to pasteboard // CopyBitPB copy bitmap to pasteboard
func CopyBitpb(bitmap C.MMBitmapRef) bool { func CopyBitPB(bitmap C.MMBitmapRef) bool {
abool := C.bitmap_copy_to_pboard(bitmap) abool := C.bitmap_copy_to_pboard(bitmap)
gbool := bool(abool) gbool := bool(abool)
return gbool return gbool
} }
// CopyBitpb copy bitmap to pasteboard, Wno-deprecated
func CopyBitpb(bitmap C.MMBitmapRef) bool {
return CopyBitPB(bitmap)
}
// DeepCopyBit deep copy bitmap // DeepCopyBit deep copy bitmap
func DeepCopyBit(bitmap C.MMBitmapRef) C.MMBitmapRef { func DeepCopyBit(bitmap C.MMBitmapRef) C.MMBitmapRef {
bit := C.bitmap_deepcopy(bitmap) bit := C.bitmap_deepcopy(bitmap)