From c7fc08adbb46625650df79c3e56703775bdfebc0 Mon Sep 17 00:00:00 2001
From: vCaesar <vzvway@gmail.com>
Date: Sun, 13 Nov 2016 18:37:41 +0800
Subject: [PATCH] Update keyboard

---
 key/goKey.h                           | 20 ++++++--------------
 key/{keycode_init.h => keycode_c.h}   |  0
 key/{keypress_init.h => keypress_c.h} |  0
 robotgo.go                            | 16 ++++++++--------
 4 files changed, 14 insertions(+), 22 deletions(-)
 rename key/{keycode_init.h => keycode_c.h} (100%)
 rename key/{keypress_init.h => keypress_c.h} (100%)

diff --git a/key/goKey.h b/key/goKey.h
index bebf1c4..ee70127 100644
--- a/key/goKey.h
+++ b/key/goKey.h
@@ -11,18 +11,12 @@
 #include "../base/types.h"
 // #include "keycode.h"
 // #include "keypress.h"
-#include "keypress_init.h"
-#include "keycode_init.h"
+#include "keypress_c.h"
+#include "keycode_c.h"
 
 
 int keyboardDelay = 10;
 
-// struct KeyNames{
-// 	const char* name;
-// 	MMKeyCode   key;
-// };
-
-// static KeyNames key_names[] ={
 struct KeyNames{
 	const char* name;
 	MMKeyCode   key;
@@ -170,10 +164,8 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags)
 }
 
 // 	//If it's not an array, it should be a single string value.
-// 	return GetFlagsFromString(value, flags);
-// }
 
-char* aKeyTap(char *k,char *aval){
+char* aKeyTap(char *k,char *akey){
 	MMKeyFlags flags = (MMKeyFlags) MOD_NONE;
 	// MMKeyFlags flags = 0;
 	MMKeyCode key;
@@ -181,8 +173,8 @@ char* aKeyTap(char *k,char *aval){
 	// char *k;
 	// k = *kstr;
 
-	if (strcmp(aval, "null") != 0){
-		switch (CheckKeyFlags(aval,&flags)){
+	if (strcmp(akey, "null") != 0){
+		switch (CheckKeyFlags(akey,&flags)){
 				case -1:
 					return "Null pointer in key flag.";
 					break;
@@ -239,7 +231,7 @@ char* aKeyToggle(char *k,char *d){
 			microsleep(keyboardDelay);
 	}
 
-	return "success";
+	return "0";
 }
 
 void aTypeString(char *str){
diff --git a/key/keycode_init.h b/key/keycode_c.h
similarity index 100%
rename from key/keycode_init.h
rename to key/keycode_c.h
diff --git a/key/keypress_init.h b/key/keypress_c.h
similarity index 100%
rename from key/keypress_init.h
rename to key/keypress_c.h
diff --git a/robotgo.go b/robotgo.go
index ccec00b..6b30577 100644
--- a/robotgo.go
+++ b/robotgo.go
@@ -278,16 +278,16 @@ func Try(fun func(), handler func(interface{})) {
 }
 
 func KeyTap(args ...string) {
-	var apara string
+	var akey string
 	Try(func() {
-		apara = args[1]
+		akey = args[1]
 	}, func(e interface{}) {
 		// Println("err:::", e)
-		apara = "null"
+		akey = "null"
 	})
 
 	zkey := C.CString(args[0])
-	amod := C.CString(apara)
+	amod := C.CString(akey)
 	// defer func() {
 	C.aKeyTap(zkey, amod)
 	// }()
@@ -297,16 +297,16 @@ func KeyTap(args ...string) {
 }
 
 func KeyToggle(args ...string) {
-	var apara string
+	var akey string
 	Try(func() {
-		apara = args[1]
+		akey = args[1]
 	}, func(e interface{}) {
 		// Println("err:::", e)
-		apara = "null"
+		akey = "null"
 	})
 
 	zkey := C.CString(args[0])
-	amod := C.CString(apara)
+	amod := C.CString(akey)
 	// defer func() {
 	str := C.aKeyToggle(zkey, amod)
 	Println(str)