From 182d9a9803d510305b0e0fc9f84524f43371b84f Mon Sep 17 00:00:00 2001
From: vcaesar <vzvway@gmail.com>
Date: Fri, 29 Dec 2017 19:36:08 +0800
Subject: [PATCH] update key toggle and update keyboard c name

---
 key/goKey.h | 12 ++++++------
 robotgo.go  | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/key/goKey.h b/key/goKey.h
index d24a6a3..054662f 100644
--- a/key/goKey.h
+++ b/key/goKey.h
@@ -209,7 +209,7 @@ char* key_Tap(char *k, char* keyArr[], int num, int keyDelay){
 	return "0";
 }
 
-char* aKeyTap(char *k, char *akey, char *keyT, int keyDelay){
+char* key_tap(char *k, char *akey, char *keyT, int keyDelay){
 	MMKeyFlags flags = (MMKeyFlags) MOD_NONE;
 	// MMKeyFlags flags = 0;
 	MMKeyCode key;
@@ -254,7 +254,7 @@ char* aKeyTap(char *k, char *akey, char *keyT, int keyDelay){
 	return "0";
 }
 
-char* key_Toggle(char *k, char *d, char *akey, char *keyT, int keyDelay){
+char* key_toggle(char *k, char *d, char *akey, char *keyT){
 	MMKeyFlags flags = (MMKeyFlags) MOD_NONE;
 	MMKeyCode key;
 
@@ -307,20 +307,20 @@ char* key_Toggle(char *k, char *d, char *akey, char *keyT, int keyDelay){
 			break;
 		default:
 			toggleKeyCode(key, down, flags);
-			microsleep(keyDelay);
+			microsleep(keyboardDelay);
 	}
 
 	return "0";
 }
 
-void aTypeString(char *str){
+void type_string(char *str){
 	typeString(str);
 }
 
-void aTypeStringDelayed(char *str, size_t cpm){
+void type_string_delayed(char *str, size_t cpm){
 	typeStringDelayed(str, cpm);
 }
 
-void aSetKeyboardDelay(size_t val){
+void set_keyboard_delay(size_t val){
 	keyboardDelay = val;
 }
\ No newline at end of file
diff --git a/robotgo.go b/robotgo.go
index 835ac63..01b40db 100644
--- a/robotgo.go
+++ b/robotgo.go
@@ -598,7 +598,7 @@ func KeyTap(args ...interface{}) {
 		amod := C.CString(akey)
 		amodt := C.CString(keyT)
 
-		C.aKeyTap(zkey, amod, amodt, C.int(keyDelay))
+		C.key_tap(zkey, amod, amodt, C.int(keyDelay))
 
 		defer C.free(unsafe.Pointer(amod))
 		defer C.free(unsafe.Pointer(amodt))
@@ -616,7 +616,7 @@ func KeyToggle(args ...string) string {
 		adown    string
 		amkey    string
 		mKeyT    string
-		keyDelay = 10
+		// keyDelay = 10
 	)
 
 	Try(func() {
@@ -643,9 +643,9 @@ func KeyToggle(args ...string) string {
 	camkey := C.CString(amkey)
 	cmKeyT := C.CString(mKeyT)
 	// defer func() {
-	str := C.key_Toggle(ckey, cadown, camkey, cmKeyT, C.int(keyDelay))
+	str:=C.key_toggle(ckey, cadown, camkey, cmKeyT)
+	// str := C.key_Toggle(ckey, cadown, camkey, cmKeyT, C.int(keyDelay))
 	// fmt.Println(str)
-	// C.aKeyToggle(ckey, cadown, camkey, cmKeyT)
 	// }()
 	defer C.free(unsafe.Pointer(ckey))
 	defer C.free(unsafe.Pointer(cadown))
@@ -658,7 +658,7 @@ func KeyToggle(args ...string) string {
 // TypeString type string
 func TypeString(x string) {
 	cx := C.CString(x)
-	C.aTypeString(cx)
+	C.type_string(cx)
 	defer C.free(unsafe.Pointer(cx))
 }
 
@@ -686,7 +686,7 @@ func WriteAll(text string) {
 func TypeStrDelay(x string, y int) {
 	cx := C.CString(x)
 	cy := C.size_t(y)
-	C.aTypeStringDelayed(cx, cy)
+	C.type_string_delayed(cx, cy)
 	defer C.free(unsafe.Pointer(cx))
 }
 
@@ -694,18 +694,18 @@ func TypeStrDelay(x string, y int) {
 func TypeStringDelayed(x string, y int) {
 	cx := C.CString(x)
 	cy := C.size_t(y)
-	C.aTypeStringDelayed(cx, cy)
+	C.type_string_delayed(cx, cy)
 	defer C.free(unsafe.Pointer(cx))
 }
 
 // SetKeyDelay set keyboard delay
 func SetKeyDelay(x int) {
-	C.aSetKeyboardDelay(C.size_t(x))
+	C.set_keyboard_delay(C.size_t(x))
 }
 
 // SetKeyboardDelay set keyboard delay, Wno-deprecated
 func SetKeyboardDelay(x int) {
-	C.aSetKeyboardDelay(C.size_t(x))
+	C.set_keyboard_delay(C.size_t(x))
 }
 
 /*