optimize robot unix getxid func

This commit is contained in:
vcaesar 2018-08-13 10:40:31 -04:00
parent 5984aad7bc
commit b4fffb3d06
2 changed files with 22 additions and 25 deletions

View File

@ -32,16 +32,7 @@ func GetBounds(pid int32, args ...int) (int, int, int, int) {
return internalGetBounds(pid, hwnd) return internalGetBounds(pid, hwnd)
} }
if xu == nil { xid, err := GetXId(xu, pid)
var err error
xu, err = xgbutil.NewConn()
if err != nil {
log.Println("xgbutil.NewConn errors is: ", err)
return 0, 0, 0, 0
}
}
xid, err := GetXidFromPid(xu, pid)
if err != nil { if err != nil {
log.Println("GetXidFromPid errors is: ", err) log.Println("GetXidFromPid errors is: ", err)
return 0, 0, 0, 0 return 0, 0, 0, 0
@ -61,16 +52,7 @@ func ActivePIDC(pid int32, args ...int) {
return return
} }
if xu == nil { xid, err := GetXId(xu, pid)
var err error
xu, err = xgbutil.NewConn()
if err != nil {
log.Println("xgbutil.NewConn errors is: ", err)
return
}
}
xid, err := GetXidFromPid(xu, pid)
if err != nil { if err != nil {
log.Println("GetXidFromPid errors is: ", err) log.Println("GetXidFromPid errors is: ", err)
return return
@ -114,6 +96,21 @@ func ActivePID(pid int32, args ...int) error {
return nil return nil
} }
// GetXId get the xid
func GetXId(xu *xgbutil.XUtil, pid int32) (xproto.Window, error) {
if xu == nil {
var err error
xu, err = xgbutil.NewConn()
if err != nil {
// log.Println("xgbutil.NewConn errors is: ", err)
return 0, err
}
}
xid, err := GetXidFromPid(xu, pid)
return xid, err
}
// GetXidFromPid get the xide from pid // GetXidFromPid get the xide from pid
func GetXidFromPid(xu *xgbutil.XUtil, pid int32) (xproto.Window, error) { func GetXidFromPid(xu *xgbutil.XUtil, pid int32) (xproto.Window, error) {
windows, err := ewmh.ClientListGet(xu) windows, err := ewmh.ClientListGet(xu)