Merge 401c6cba6c into a8c387a070

key.go

@@ -416,7 +416,7 @@ func keyTaps(k string, keyArr []string, pid int) error {
 	return nil
 }
 
-func getKeyDown(keyArr []string) (bool, []string) {
+func keyToggles(k string, keyArr []string, pid int) error {
 	if len(keyArr) <= 0 {
 		keyArr = append(keyArr, "down")
 	}
@@ -429,11 +429,8 @@ func getKeyDown(keyArr []string) (bool, []string) {
 	if keyArr[0] == "up" || keyArr[0] == "down" {
 		keyArr = keyArr[1:]
 	}
-	return down, keyArr
-}
-
-func keyTogglesB(k string, down bool, keyArr []string, pid int) error {
 	flags := getFlagsFromValue(keyArr)
+
 	key, err := checkKeyCodes(k)
 	if err != nil {
 		return err
@@ -444,11 +441,6 @@ func keyTogglesB(k string, down bool, keyArr []string, pid int) error {
 	return nil
 }
 
-func keyToggles(k string, keyArr []string, pid int) error {
-	down, keyArr1 := getKeyDown(keyArr)
-	return keyTogglesB(k, down, keyArr1, pid)
-}
-
 /*
  __  ___  ___________    ____ .______     ______        ___      .______       _______
 |  |/  / |   ____\   \  /   / |   _  \   /  __  \      /   \     |   _  \     |       \
@@ -486,22 +478,6 @@ func toErr(str *C.char) error {
 	return errors.New(gstr)
 }
 
-func appendShift(key string, len1 int, args ...interface{}) []interface{} {
-	if len(key) > 0 && unicode.IsUpper([]rune(key)[0]) {
-		args = append(args, "shift")
-	}
-
-	key = strings.ToLower(key)
-	if _, ok := Special[key]; ok {
-		key = Special[key]
-		if len(args) <= len1 {
-			args = append(args, "shift")
-		}
-	}
-
-	return args
-}
-
 // KeyTap taps the keyboard code;
 //
 // See keys supported:
@@ -520,7 +496,18 @@ func appendShift(key string, len1 int, args ...interface{}) []interface{} {
 //	robotgo.KeyTap("k", pid int)
 func KeyTap(key string, args ...interface{}) error {
 	var keyArr []string
-	args = appendShift(key, 0, args...)
+
+	if len(key) > 0 && unicode.IsUpper([]rune(key)[0]) {
+		args = append(args, "shift")
+	}
+
+	key = strings.ToLower(key)
+	if _, ok := Special[key]; ok {
+		key = Special[key]
+		if len(args) <= 0 {
+			args = append(args, "shift")
+		}
+	}
 
 	pid := 0
 	if len(args) > 0 {
@@ -539,16 +526,6 @@ func KeyTap(key string, args ...interface{}) error {
 	return keyTaps(key, keyArr, pid)
 }
 
-func getToggleArgs(args ...interface{}) (pid int, keyArr []string) {
-	if len(args) > 0 && reflect.TypeOf(args[0]) == reflect.TypeOf(pid) {
-		pid = args[0].(int)
-		keyArr = ToStrings(args[1:])
-	} else {
-		keyArr = ToStrings(args)
-	}
-	return
-}
-
 // KeyToggle toggles the keyboard, if there not have args default is "down"
 //
 // See keys:
@@ -563,8 +540,28 @@ func getToggleArgs(args ...interface{}) (pid int, keyArr []string) {
 //	robotgo.KeyToggle("a", "up", "alt", "cmd")
 //	robotgo.KeyToggle("k", pid int)
 func KeyToggle(key string, args ...interface{}) error {
-	args = appendShift(key, 1, args...)
+
-	pid, keyArr := getToggleArgs(args...)
+	if len(key) > 0 && unicode.IsUpper([]rune(key)[0]) {
+		args = append(args, "shift")
+	}
+
+	key = strings.ToLower(key)
+	if _, ok := Special[key]; ok {
+		key = Special[key]
+		if len(args) <= 1 {
+			args = append(args, "shift")
+		}
+	}
+
+	pid := 0
+	var keyArr []string
+	if len(args) > 0 && reflect.TypeOf(args[0]) == reflect.TypeOf(pid) {
+		pid = args[0].(int)
+		keyArr = ToStrings(args[1:])
+	} else {
+		keyArr = ToStrings(args)
+	}
+
 	return keyToggles(key, keyArr, pid)
 }
 

robotgo_ocr.go

@@ -14,7 +14,7 @@
 package robotgo
 
 import (
-	"github.com/otiai10/gosseract/v2"
+	"github.com/otiai10/gosseract"
 )
 
 // GetText get the image text by tesseract ocr