laipeng/robotgo
1
0
Fork 0
mirror of https://github.com/go-vgo/robotgo.git synced 2025-06-02 23:23:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #281 from go-vgo/op-pr

Browse Source 
optimize code and update version
This commit is contained in:
vz 2020-08-08 11:15:16 -04:00 committed by GitHub
commit f77b561d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
robotgo.go
View File

@ -69,7 +69,7 @@ import (
const ( const (
// Version get the robotgo version // Version get the robotgo version
Version = "v0.90.0.1050, MT. Rainier!" Version = "v0.90.3.1072, MT. Rainier!"
) )
// GetVersion get the robotgo version // GetVersion get the robotgo version
@ -89,8 +89,8 @@ type (
// Bitmap is Bitmap struct // Bitmap is Bitmap struct
type Bitmap struct { type Bitmap struct {
ImgBuf *uint8 ImgBuf *uint8
Width int Width, Height int
Height int
Bytewidth int Bytewidth int
BitsPixel uint8 BitsPixel uint8
BytesPerPixel uint8 BytesPerPixel uint8
@ -306,9 +306,9 @@ func CaptureScreen(args ...int) C.MMBitmapRef {
} else { } else {
x = 0 x = 0
y = 0 y = 0
// Get screen size. // Get screen size.
var displaySize C.MMSizeInt32 displaySize := C.getMainDisplaySize()
displaySize = C.getMainDisplaySize()
w = displaySize.w w = displaySize.w
h = displaySize.h h = displaySize.h
} }
@ -638,7 +638,6 @@ func KeyTap(tapKey string, args ...interface{}) string {
amod := C.CString(akey) amod := C.CString(akey)
amodt := C.CString(keyT) amodt := C.CString(keyT)
str := C.key_tap(zkey, amod, amodt, C.int(keyDelay)) str := C.key_tap(zkey, amod, amodt, C.int(keyDelay))
C.free(unsafe.Pointer(amod)) C.free(unsafe.Pointer(amod))
@ -659,7 +658,6 @@ func KeyToggle(key string, args ...string) string {
ckeyArr := make([](*C.char), 0) ckeyArr := make([](*C.char), 0)
if len(args) > 3 { if len(args) > 3 {
num := len(args) num := len(args)
for i := 0; i < num; i++ { for i := 0; i < num; i++ {
ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(args[i])))) ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(args[i]))))
} }
@ -678,7 +676,6 @@ func KeyToggle(key string, args ...string) string {
if len(args) > 1 { if len(args) > 1 {
mKey = args[1] mKey = args[1]
if len(args) > 2 { if len(args) > 2 {
mKeyT = args[2] mKeyT = args[2]
} }
@ -1536,7 +1533,7 @@ func internalActive(pid int32, hwnd int) {
func ActiveName(name string) error { func ActiveName(name string) error {
pids, err := FindIds(name) pids, err := FindIds(name)
if err == nil && len(pids) > 0 { if err == nil && len(pids) > 0 {
ActivePID(pids[0]) return ActivePID(pids[0])
} }
return err return err