Merge be5a13d7b3 into 48706562fc

Fix: return key

CONTRIBUTING.md

@@ -30,20 +30,18 @@ Before sending code out for review, run all the tests for the whole tree to make
 
 In addition to the owner, Changes to Robotgo must be reviewed before they are accepted, no matter who makes the change even if it is a maintainer. We use GitHub's pull request workflow to do that and we also use [LGTM](http://lgtm.co) to ensure every PR is reviewed by vz or least 2 maintainers.
 
-
 ## Sign your work
 
-The sign-off is a simple line at the end of the explanation for the patch. Your signature certifies that you wrote the patch or otherwise have the right to pass it on as an open-source patch. 
+The sign-off is a simple line at the end of the explanation for the patch. Your signature certifies that you wrote the patch or otherwise have the right to pass it on as an open-source patch.
 
 ## Maintainers
 
-To make sure every PR is checked, we got team maintainers. A maintainer should be a contributor of Robotgo and contributed at least 4 accepted PRs. 
+To make sure every PR is checked, we got team maintainers. A maintainer should be a contributor of Robotgo and contributed at least 4 accepted PRs.
 
 ## Owners
 
 Since Robotgo is a pure community organization without any company support, Copyright 2016 The go-vgo Project Developers.
 
-
 ## Versions
 
 Robotgo has the `master` branch as a tip branch and has version branches such as `v0.30.0`. `v0.40.0` is a release branch and we will tag `v0.40.0` for binary download. If `v0.40.0` has bugs, we will accept pull requests on the `v0.40.0` branch and publish a `v0.40.1` tag, after bringing the bug fix also to the master branch.
@@ -60,9 +58,9 @@ Code that you contribute should use the standard copyright header:
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 ```
 

README.md

@@ -61,6 +61,7 @@ GCC
 ```
 
 #### For MacOS:
+
 ```
 brew install go
 ```
@@ -72,6 +73,7 @@ xcode-select --install
 ```
 
 #### For Windows:
+
 ```
 winget install Golang.go
 ```
@@ -535,6 +537,6 @@ func main() {
 
 ## License
 
-Robotgo is primarily distributed under the terms of "both the MIT license and the Apache License (Version 2.0)", with portions covered by various BSD-like licenses.
+Robotgo is primarily distributed under the terms of "the Apache License (Version 2.0)", with portions covered by various BSD-like licenses.
 
-See [LICENSE-APACHE](http://www.apache.org/licenses/LICENSE-2.0), [LICENSE-MIT](https://github.com/go-vgo/robotgo/blob/master/LICENSE).
+See [LICENSE-APACHE](http://www.apache.org/licenses/LICENSE-2.0), [LICENSE](https://github.com/go-vgo/robotgo/blob/master/LICENSE).

doc.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo

examples/key/main.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package main

examples/main.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package main

examples/mouse/main.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package main

examples/screen/main.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package main

examples/window/main.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package main

img.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo

key.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo
@@ -416,7 +416,7 @@ func keyTaps(k string, keyArr []string, pid int) error {
 	return nil
 }
 
-func keyToggles(k string, keyArr []string, pid int) error {
+func getKeyDown(keyArr []string) (bool, []string) {
 	if len(keyArr) <= 0 {
 		keyArr = append(keyArr, "down")
 	}
@@ -429,8 +429,11 @@ func keyToggles(k string, keyArr []string, pid int) error {
 	if keyArr[0] == "up" || keyArr[0] == "down" {
 		keyArr = keyArr[1:]
 	}
-	flags := getFlagsFromValue(keyArr)
+	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
@@ -441,6 +444,11 @@ func keyToggles(k string, 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)
+}
+
 /*
  __  ___  ___________    ____ .______     ______        ___      .______       _______
 |  |/  / |   ____\   \  /   / |   _  \   /  __  \      /   \     |   _  \     |       \
@@ -478,6 +486,22 @@ func toErr(str *C.char) error {
 	return errors.New(gstr)
 }
 
+func appendShift(key string, len1 int, args ...interface{}) (string, []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 key, args
+}
+
 // KeyTap taps the keyboard code;
 //
 // See keys supported:
@@ -496,18 +520,7 @@ func toErr(str *C.char) error {
 //	robotgo.KeyTap("k", pid int)
 func KeyTap(key string, args ...interface{}) error {
 	var keyArr []string
-
+	key, 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 {
@@ -526,6 +539,16 @@ 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:
@@ -540,28 +563,8 @@ func KeyTap(key string, args ...interface{}) error {
 //	robotgo.KeyToggle("a", "up", "alt", "cmd")
 //	robotgo.KeyToggle("k", pid int)
 func KeyToggle(key string, args ...interface{}) error {
-
+	key, args = appendShift(key, 1, args...)
-	if len(key) > 0 && unicode.IsUpper([]rune(key)[0]) {
+	pid, keyArr := getToggleArgs(args...)
-		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)
 }
 

key/key.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package key

key/keypress_c.h

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0> 
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 #include "../base/deadbeef_rand_c.h"

keycode.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo

mouse/mouse.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package mouse

ps.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo

robot_info_test.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo_test

robotgo.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 /*

robotgo_mac.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build darwin

robotgo_mac_unix.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build !windows

robotgo_mac_win.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build darwin || windows

robotgo_ocr.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build ocr
@@ -14,7 +14,7 @@
 package robotgo
 
 import (
-	"github.com/otiai10/gosseract"
+	"github.com/otiai10/gosseract/v2"
 )
 
 // GetText get the image text by tesseract ocr

robotgo_test.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build darwin || windows

robotgo_win.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build windows

robotgo_x11.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 //go:build !darwin && !windows

screen.go

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0>
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 package robotgo

screen/goScreen.h

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0> 
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 #include "../base/types.h"

window/goWindow.h

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0> 
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 #include "alert_c.h"

window/pub.h

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0> 
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 // #include "../base/os.h"

window/win_sys.h

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0> 
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 // #if defined(USE_X11)

window/window.h

@@ -3,9 +3,9 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// http://www.apache.org/licenses/LICENSE-2.0> 
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+//
-// option. This file may not be copied, modified, or distributed
+// This file may not be copied, modified, or distributed
 // except according to those terms.
 
 #include "pub.h"