Skip to content

Commit 469cd4d

Browse files
vcaesarvcaesar
committed
Update & Add: unified use the int to replace int32;
unified name and add more func; Update gomod and CI
1 parent fc5dac6 commit 469cd4d

File tree

16 files changed

+168
-137
lines changed

16 files changed

+168
-137
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
docker:
66
# using custom image, see .circleci/images/primary/Dockerfile
77
# - image: govgo/robotgoci:1.10.3
8-
- image: golang:1.19.1
8+
- image: golang:1.19.3
99
working_directory: /gopath/src/github.com/go-vgo/robotgo
1010
steps:
1111
- checkout

‎.circleci/images/primary/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# FROM golang:1.10.1
2-
FROM golang:1.19.1-stretch AS build
2+
FROM golang:1.19.3-stretch AS build
33
# FROM govgo/go:1.11.1
44

55
RUN apt update && apt install -y --no-install-recommends \

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ environment:
3434
PATH: C:\msys64\mingw32\bin\;C:\Program Files (x86)\NSIS\;%PATH%
3535
# - COMPILER: MINGW_W64
3636
# ARCHITECTURE: x64
37-
GOVERSION: 1.19.1
37+
GOVERSION: 1.19.3
3838
# GOPATH: c:\gopath
3939

4040
# scripts that run after cloning repository

‎examples/window/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func findIds() {
5656

5757
if len(fpid) > 0 {
5858
robotgo.KeyTap("a", fpid[0])
59-
robotgo.TypeStr("Hi galaxy!", int(fpid[0]))
59+
robotgo.TypeStr("Hi galaxy!", fpid[0])
6060

6161
robotgo.KeyToggle("a", fpid[0], "cmd")
6262
robotgo.KeyToggle("a", fpid[0], "cmd", "up")

‎go.mod

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,23 @@ require (
88
// github.com/robotn/gohook v0.31.3
99
github.com/robotn/xgb v0.0.0-20190912153532-2cb92d044934
1010
github.com/robotn/xgbutil v0.0.0-20190912154524-c861d6f87770
11-
github.com/vcaesar/gops v0.23.0
11+
github.com/vcaesar/gops v0.30.0
1212
github.com/vcaesar/imgo v0.30.1
1313
github.com/vcaesar/keycode v0.10.0
1414
github.com/vcaesar/tt v0.20.0
15-
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
16-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
15+
golang.org/x/image v0.1.0 // indirect
1716
)
1817

1918
require (
20-
github.com/davecgh/go-spew v1.1.1 // indirect
2119
github.com/go-ole/go-ole v1.2.6 // indirect
22-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
20+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
2321
github.com/otiai10/mint v1.3.0 // indirect
24-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
25-
github.com/shirou/gopsutil/v3 v3.22.4 // indirect
26-
github.com/tklauser/go-sysconf v0.3.10 // indirect
27-
github.com/tklauser/numcpus v0.4.0 // indirect
22+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
23+
github.com/shirou/gopsutil/v3 v3.22.10 // indirect
24+
github.com/tklauser/go-sysconf v0.3.11 // indirect
25+
github.com/tklauser/numcpus v0.6.0 // indirect
2826
github.com/yusufpapurcu/wmi v1.2.2 // indirect
29-
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 // indirect
27+
golang.org/x/sys v0.2.0 // indirect
3028
)
3129

3230
// replace golang.org/x/sys => github.com/golang/sys v0.0.0-20190109145017-48ac38b7c8cb

‎go.sum

Lines changed: 43 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
66
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
77
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
88
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
9-
github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
10-
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
11-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
9+
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
10+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1211
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
12+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY=
13+
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE=
1314
github.com/lxn/win v0.0.0-20210218163916-a377121e959e h1:H+t6A/QJMbhCSEH5rAuRxh+CtW96g0Or0Fxa9IKr4uc=
1415
github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
1516
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
@@ -19,51 +20,73 @@ github.com/otiai10/mint v1.3.0 h1:Ady6MKVezQwHBkGzLFbrsywyp09Ah7rkmfjV3Bcr5uc=
1920
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
2021
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2122
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
22-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
2323
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
24+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
25+
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
2426
github.com/robotn/xgb v0.0.0-20190912153532-2cb92d044934 h1:2lhSR8N3T6I30q096DT7/5AKEIcf1vvnnWAmS0wfnNY=
2527
github.com/robotn/xgb v0.0.0-20190912153532-2cb92d044934/go.mod h1:SxQhJskUJ4rleVU44YvnrdvxQr0tKy5SRSigBrCgyyQ=
2628
github.com/robotn/xgbutil v0.0.0-20190912154524-c861d6f87770 h1:2uX8QRLkkxn2EpAQ6I3KhA79BkdRZfvugJUzJadiJwk=
2729
github.com/robotn/xgbutil v0.0.0-20190912154524-c861d6f87770/go.mod h1:svkDXUDQjUiWzLrA0OZgHc4lbOts3C+uRfP6/yjwYnU=
28-
github.com/shirou/gopsutil/v3 v3.22.4 h1:srAQaiX6jX/cYL6q29aE0m8lOskT9CurZ9N61YR3yoI=
29-
github.com/shirou/gopsutil/v3 v3.22.4/go.mod h1:D01hZJ4pVHPpCTZ3m3T2+wDF2YAGfd+H4ifUguaQzHM=
30+
github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg=
31+
github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk=
3032
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
31-
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
33+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
34+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
3235
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
33-
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
36+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
37+
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
38+
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
3439
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
35-
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
40+
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
41+
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
3642
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
37-
github.com/vcaesar/gops v0.23.0 h1:gY/E5UJfLpImJjE7tiTJIVRcKOWxi7YX1J/CUHK8gXk=
38-
github.com/vcaesar/gops v0.23.0/go.mod h1:3IepRPE6qK9Wy8MGLJx2N3o77fuO1Ec7FvPHyEuou8I=
43+
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
44+
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
45+
github.com/vcaesar/gops v0.30.0 h1:970FznFxZP8ku0zckJRO+pI2fFhg3uJ0z+sQS0NHP4o=
46+
github.com/vcaesar/gops v0.30.0/go.mod h1:xV1wieUA4D9RaNQ8lf8AwPZ8bl+x/MM5w3SsMCr5KVs=
3947
github.com/vcaesar/imgo v0.30.1 h1:B7QMm2mZY+SGoEvvJwNi+eAv21ptvk2YT1IbP2OzyLE=
4048
github.com/vcaesar/imgo v0.30.1/go.mod h1:n4EluJIN/0UYYGPHBCY/BWlIjdRUdY5U6obtP2lrgdM=
4149
github.com/vcaesar/keycode v0.10.0 h1:Qx5QE8ZXHyRyjoA2QOxBp25OKMKB+zxMVqm0FWGV0d4=
4250
github.com/vcaesar/keycode v0.10.0/go.mod h1:JNlY7xbKsh+LAGfY2j4M3znVrGEm5W1R8s/Uv6BJcfQ=
4351
github.com/vcaesar/tt v0.20.0 h1:9t2Ycb9RNHcP0WgQgIaRKJBB+FrRdejuaL6uWIHuoBA=
4452
github.com/vcaesar/tt v0.20.0/go.mod h1:GHPxQYhn+7OgKakRusH7KJ0M5MhywoeLb8Fcffs/Gtg=
53+
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
4554
github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
4655
github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
4756
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
48-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
49-
golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
57+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
5058
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
51-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
52-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
53-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
59+
golang.org/x/image v0.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk=
60+
golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c=
61+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
62+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
63+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
64+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
65+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
66+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
67+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5468
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
55-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5669
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
57-
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5870
golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
71+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5972
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
60-
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27 h1:XDXtA5hveEEV8JB2l7nhMTp3t3cHp9ZpwcdjqyEWLlo=
73+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6174
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
75+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
76+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77+
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
78+
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
79+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
80+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
6281
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6382
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
6483
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
84+
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
85+
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
6586
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
66-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
87+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
88+
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
89+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6790
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6891
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6992
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎ps.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ import ps "github.com/vcaesar/gops"
1414

1515
// Nps process struct
1616
type Nps struct {
17-
Pid int32
17+
Pid int
1818
Name string
1919
}
2020

2121
// Pids get the all process id
22-
func Pids() ([]int32, error) {
22+
func Pids() ([]int, error) {
2323
return ps.Pids()
2424
}
2525

2626
// PidExists determine whether the process exists
27-
func PidExists(pid int32) (bool, error) {
27+
func PidExists(pid int) (bool, error) {
2828
return ps.PidExists(pid)
2929
}
3030

@@ -45,7 +45,7 @@ func Process() ([]Nps, error) {
4545
}
4646

4747
// FindName find the process name by the process id
48-
func FindName(pid int32) (string, error) {
48+
func FindName(pid int) (string, error) {
4949
return ps.FindName(pid)
5050
}
5151

@@ -57,12 +57,12 @@ func FindNames() ([]string, error) {
5757
// FindIds finds the all processes named with a subset
5858
// of "name" (case insensitive),
5959
// return matched IDs.
60-
func FindIds(name string) ([]int32, error) {
60+
func FindIds(name string) ([]int, error) {
6161
return ps.FindIds(name)
6262
}
6363

6464
// FindPath find the process path by the process pid
65-
func FindPath(pid int32) (string, error) {
65+
func FindPath(pid int) (string, error) {
6666
return ps.FindPath(pid)
6767
}
6868

@@ -72,6 +72,6 @@ func Run(path string) ([]byte, error) {
7272
}
7373

7474
// Kill kill the process by PID
75-
func Kill(pid int32) error {
75+
func Kill(pid int) error {
7676
return ps.Kill(pid)
7777
}

‎robotgo.go

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -920,55 +920,55 @@ func GetActive() C.MData {
920920
}
921921

922922
// MinWindow set the window min
923-
func MinWindow(pid int32, args ...interface{}) {
923+
func MinWindow(pid int, args ...interface{}) {
924924
var (
925925
state = true
926-
hwnd int
926+
isPid int
927927
)
928928

929929
if len(args) > 0 {
930930
state = args[0].(bool)
931931
}
932932
if len(args) > 1 {
933-
hwnd = args[1].(int)
933+
isPid = args[1].(int)
934934
}
935935

936-
C.min_window(C.uintptr(pid), C.bool(state), C.uintptr(hwnd))
936+
C.min_window(C.uintptr(pid), C.bool(state), C.int8_t(isPid))
937937
}
938938

939939
// MaxWindow set the window max
940-
func MaxWindow(pid int32, args ...interface{}) {
940+
func MaxWindow(pid int, args ...interface{}) {
941941
var (
942942
state = true
943-
hwnd int
943+
isPid int
944944
)
945945

946946
if len(args) > 0 {
947947
state = args[0].(bool)
948948
}
949949
if len(args) > 1 {
950-
hwnd = args[1].(int)
950+
isPid = args[1].(int)
951951
}
952952

953-
C.max_window(C.uintptr(pid), C.bool(state), C.uintptr(hwnd))
953+
C.max_window(C.uintptr(pid), C.bool(state), C.int8_t(isPid))
954954
}
955955

956956
// CloseWindow close the window
957-
func CloseWindow(args ...int32) {
957+
func CloseWindow(args ...int) {
958958
if len(args) <= 0 {
959959
C.close_main_window()
960960
return
961961
}
962962

963-
var hwnd, isHwnd int32
963+
var pid, isPid int
964964
if len(args) > 0 {
965-
hwnd = args[0]
965+
pid = args[0]
966966
}
967967
if len(args) > 1 {
968-
isHwnd = args[1]
968+
isPid = args[1]
969969
}
970970

971-
C.close_window_by_PId(C.uintptr(hwnd), C.uintptr(isHwnd))
971+
C.close_window_by_PId(C.uintptr(pid), C.int8_t(isPid))
972972
}
973973

974974
// SetHandle set the window handle
@@ -978,23 +978,23 @@ func SetHandle(hwnd int) {
978978
}
979979

980980
// SetHandlePid set the window handle by pid
981-
func SetHandlePid(pid int32, args ...int32) {
982-
var isHwnd int32
981+
func SetHandlePid(pid int, args ...int) {
982+
var isPid int
983983
if len(args) > 0 {
984-
isHwnd = args[0]
984+
isPid = args[0]
985985
}
986986

987-
C.set_handle_pid_mData(C.uintptr(pid), C.uintptr(isHwnd))
987+
C.set_handle_pid_mData(C.uintptr(pid), C.int8_t(isPid))
988988
}
989989

990990
// GetHandPid get handle mdata by pid
991-
func GetHandPid(pid int32, args ...int32) C.MData {
992-
var isHwnd int32
991+
func GetHandPid(pid int, args ...int) C.MData {
992+
var isPid int
993993
if len(args) > 0 {
994-
isHwnd = args[0]
994+
isPid = args[0]
995995
}
996996

997-
return C.set_handle_pid(C.uintptr(pid), C.uintptr(isHwnd))
997+
return C.set_handle_pid(C.uintptr(pid), C.int8_t(isPid))
998998
}
999999

10001000
// GetHandle get the window handle
@@ -1018,8 +1018,8 @@ func GetBHandle() int {
10181018
return ghwnd
10191019
}
10201020

1021-
func cgetTitle(hwnd, isHwnd int32) string {
1022-
title := C.get_title_by_pid(C.uintptr(hwnd), C.uintptr(isHwnd))
1021+
func cgetTitle(pid, isPid int) string {
1022+
title := C.get_title_by_pid(C.uintptr(pid), C.int8_t(isPid))
10231023
gtitle := C.GoString(title)
10241024

10251025
return gtitle
@@ -1033,7 +1033,7 @@ func cgetTitle(hwnd, isHwnd int32) string {
10331033
//
10341034
// ids, _ := robotgo.FindIds()
10351035
// robotgo.GetTitle(ids[0])
1036-
func GetTitle(args ...int32) string {
1036+
func GetTitle(args ...int) string {
10371037
if len(args) <= 0 {
10381038
title := C.get_main_title()
10391039
gtitle := C.GoString(title)
@@ -1048,20 +1048,20 @@ func GetTitle(args ...int32) string {
10481048
}
10491049

10501050
// GetPid get the process id return int32
1051-
func GetPid() int32 {
1051+
func GetPid() int {
10521052
pid := C.get_PID()
1053-
return int32(pid)
1053+
return int(pid)
10541054
}
10551055

10561056
// internalGetBounds get the window bounds
1057-
func internalGetBounds(pid int32, hwnd int) (int, int, int, int) {
1058-
bounds := C.get_bounds(C.uintptr(pid), C.uintptr(hwnd))
1057+
func internalGetBounds(pid, isPid int) (int, int, int, int) {
1058+
bounds := C.get_bounds(C.uintptr(pid), C.int8_t(isPid))
10591059
return int(bounds.X), int(bounds.Y), int(bounds.W), int(bounds.H)
10601060
}
10611061

10621062
// internalGetClient get the window client bounds
1063-
func internalGetClient(pid int32, hwnd int) (int, int, int, int) {
1064-
bounds := C.get_client(C.uintptr(pid), C.uintptr(hwnd))
1063+
func internalGetClient(pid, isPid int) (int, int, int, int) {
1064+
bounds := C.get_client(C.uintptr(pid), C.int8_t(isPid))
10651065
return int(bounds.X), int(bounds.Y), int(bounds.W), int(bounds.H)
10661066
}
10671067

@@ -1071,19 +1071,19 @@ func Is64Bit() bool {
10711071
return bool(b)
10721072
}
10731073

1074-
func internalActive(pid int32, hwnd int) {
1075-
C.active_PID(C.uintptr(pid), C.uintptr(hwnd))
1074+
func internalActive(pid, isPid int) {
1075+
C.active_PID(C.uintptr(pid), C.int8_t(isPid))
10761076
}
10771077

10781078
// ActivePid active the window by Pid,
10791079
// If args[0] > 0 on the Windows platform via a window handle to active
10801080
// func ActivePid(pid int32, args ...int) {
1081-
// var hwnd int
1081+
// var isPid int
10821082
// if len(args) > 0 {
1083-
// hwnd = args[0]
1083+
// isPid = args[0]
10841084
// }
10851085

1086-
// C.active_PID(C.uintptr(pid), C.uintptr(hwnd))
1086+
// C.active_PID(C.uintptr(pid), C.uintptr(isPid))
10871087
// }
10881088

10891089
// ActiveName active the window by name

0 commit comments

Comments
 (0)