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 #86 from go-vgo/dep-pr

Browse Source 
Add func PointInBounds() and Update vendor
This commit is contained in:
vz 2017-12-20 23:09:46 +08:00 committed by GitHub
commit fe2dc55988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitmap/goBitmap.h
View File

@ -117,6 +117,18 @@ MMPoint aFindBitmap(MMBitmapRef bit_map, MMRect rect){
return point;
}
bool point_in_bounds(MMBitmapRef bitmap, MMPoint point){
if (!bitmap_ready(bitmap)) {
return NULL;
}
if (MMBitmapPointInBounds(bitmap, point)) {
return true;
}
return false;
}
MMBitmapRef bitmap_open(char *path, uint16_t ttype){
// MMImageType type;
@ -146,7 +158,7 @@ char *bitmap_save(MMBitmapRef bitmap, char *path, uint16_t type){
if (saveMMBitmapToFile(bitmap, path, (MMImageType) type) != 0) {
return "Could not save image to file.";
}
//destroyMMBitmap(bitmap);
// destroyMMBitmap(bitmap);
return "ok";
}

3
examples/bitmap/main.go
View File

@ -50,6 +50,9 @@ func main() {
fx, fy = robotgo.FindBitmap(bit, bitmap)
fmt.Println("FindBitmap------", fx, fy)
abool := robotgo.PointInBounds(bitmap, 1, 2)
fmt.Println("point in bounds...", abool)
// returns new bitmap object created from a portion of another
bitpos := robotgo.GetPortion(bitmap, 10, 10, 11, 10)
fmt.Println(bitpos)

4
examples/main.go
View File

@ -162,6 +162,10 @@ func bitmap() {
fx, fy = robotgo.FindBitmap(bit, bitmap)
fmt.Println("FindBitmap------", fx, fy)
// bitmap := robotgo.CaptureScreen(10, 20, 30, 40)
abool := robotgo.PointInBounds(bitmap, 1, 2)
fmt.Println("point in bounds...", abool)
// returns new bitmap object created from a portion of another
bitpos := robotgo.GetPortion(bitmap, 10, 10, 11, 10)
fmt.Println(bitpos)

32
robotgo.go
View File

@ -62,7 +62,7 @@ import (
)
const (
version string = "v0.47.0.442, Mount Cook!"
version string = "v0.47.0.445, Mount Cook!"
)
type (
@ -165,7 +165,7 @@ func CaptureScreen(args ...int) C.MMBitmapRef {
// fmt.Println("err:::", e)
x = 0
y = 0
//Get screen size.
// Get screen size.
var displaySize C.MMSize
displaySize = C.getMainDisplaySize()
w = displaySize.width
@ -286,7 +286,7 @@ func SaveCapture(spath string, args ...int) {
// MoveMouse move the mouse
func MoveMouse(x, y int) {
//C.size_t int
// C.size_t int
cx := C.size_t(x)
cy := C.size_t(y)
C.aMoveMouse(cx, cy)
@ -483,8 +483,8 @@ func KeyTap(args ...interface{}) {
keyarr []string
num int
)
// var ckeyarr []*C.char
ckeyarr := make([](*_Ctype_char), 0)
// var ckeyArr []*C.char
ckeyArr := make([](*_Ctype_char), 0)
Try(func() {
if reflect.TypeOf(args[1]) == reflect.TypeOf(keyarr) {
@ -494,7 +494,7 @@ func KeyTap(args ...interface{}) {
num = len(keyarr)
for i := 0; i < num; i++ {
ckeyarr = append(ckeyarr, (*C.char)(unsafe.Pointer(C.CString(keyarr[i]))))
ckeyArr = append(ckeyArr, (*C.char)(unsafe.Pointer(C.CString(keyarr[i]))))
}
} else {
@ -519,7 +519,7 @@ func KeyTap(args ...interface{}) {
zkey := C.CString(args[0].(string))
if akey == "" && len(keyarr) != 0 {
C.aKey_Tap(zkey, (**_Ctype_char)(unsafe.Pointer(&ckeyarr[0])), C.int(num))
C.aKey_Tap(zkey, (**_Ctype_char)(unsafe.Pointer(&ckeyArr[0])), C.int(num))
} else {
// zkey := C.CString(args[0])
amod := C.CString(akey)
@ -547,18 +547,18 @@ func KeyToggle(args ...string) string {
Try(func() {
adown = args[1]
Try(func() {
if len(args) > 2 {
amkey = args[2]
Try(func() {
amkeyt = args[3]
}, func(e interface{}) {
// fmt.Println("err:::", e)
amkeyt = "null"
})
}, func(e interface{}) {
// fmt.Println("err:::", e)
} else {
amkey = "null"
})
}
}, func(e interface{}) {
// fmt.Println("err:::", e)
adown = "null"
@ -733,6 +733,16 @@ func FindBit(args ...interface{}) (int, int) {
return int(pos.x), int(pos.y)
}
// PointInBounds bitmap point in bounds
func PointInBounds(bitmap C.MMBitmapRef, x, y int) bool {
var point C.MMPoint
point.x = C.size_t(x)
point.y = C.size_t(y)
cbool := C.point_in_bounds(bitmap, point)
return bool(cbool)
}
// OpenBitmap open the bitmap
func OpenBitmap(args ...interface{}) C.MMBitmapRef {
path := C.CString(args[0].(string))

4
vendor/github.com/shirou/gopsutil/process/process_windows.go generated vendored
View File

@ -5,6 +5,7 @@ package process
import (
"context"
"fmt"
"os"
"strings"
"syscall"
"time"
@ -407,7 +408,8 @@ func (p *Process) Terminate() error {
}
func (p *Process) Kill() error {
return common.ErrNotImplementedError
process := os.Process{Pid: int(p.Pid)}
return process.Kill()
}
func getFromSnapProcess(pid int32) (int32, int32, string, error) {

14
vendor/vendor.json vendored
View File

@ -59,14 +59,14 @@
{
"checksumSHA1": "jWpwWWcywJPNhKTYxi4RXds+amQ=",
"path": "github.com/shirou/gopsutil/internal/common",
"revision": "b8c456e53432efdbba4ee9e55d27f69cb2dcf1ee",
"revisionTime": "2017-12-09T07:50:03Z"
"revision": "27389f01ec9364f60d6dba4fbe9751d3b7058d46",
"revisionTime": "2017-12-14T06:29:47Z"
},
{
"checksumSHA1": "UuwHornIODuEq7fYnsZwdVgERLk=",
"path": "github.com/shirou/gopsutil/mem",
"revision": "a8bc26299477e53c4ca89f7ec60160a74d4c0890",
"revisionTime": "2017-11-12T16:40:41Z"
"revision": "27389f01ec9364f60d6dba4fbe9751d3b7058d46",
"revisionTime": "2017-12-14T06:29:47Z"
},
{
"checksumSHA1": "AiC1wzY1Rjxs7iitVBvn4YM886k=",
@ -75,10 +75,10 @@
"revisionTime": "2017-11-12T16:40:41Z"
},
{
"checksumSHA1": "v3USS/LSyBuVc/DMBV+GX4ikZ5M=",
"checksumSHA1": "DRj2E2ZXWdb8UtaGLIDKa64IRHk=",
"path": "github.com/shirou/gopsutil/process",
"revision": "b8c456e53432efdbba4ee9e55d27f69cb2dcf1ee",
"revisionTime": "2017-12-09T07:50:03Z"
"revision": "27389f01ec9364f60d6dba4fbe9751d3b7058d46",
"revisionTime": "2017-12-14T06:29:47Z"
},
{
"checksumSHA1": "Nve7SpDmjsv6+rhkXAkfg/UQx94=",