From fb2d6f2720100d1d0f56c5deb9b368c9fe5909e7 Mon Sep 17 00:00:00 2001 From: vcaesar Date: Tue, 27 Oct 2020 10:46:17 -0400 Subject: [PATCH] update error return and print --- robotgo_unix.go | 16 +++++++--------- window/window.h | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/robotgo_unix.go b/robotgo_unix.go index 524f96b..1463e75 100644 --- a/robotgo_unix.go +++ b/robotgo_unix.go @@ -28,13 +28,12 @@ func GetBounds(pid int32, args ...int) (int, int, int, int) { var hwnd int if len(args) > 0 { hwnd = args[0] - return internalGetBounds(pid, hwnd) } xid, err := GetXId(xu, pid) if err != nil { - log.Println("GetXid from Pid errors is: ", err) + log.Println("Get Xid from Pid errors is: ", err) return 0, 0, 0, 0 } @@ -46,13 +45,12 @@ func internalGetTitle(pid int32, args ...int32) string { var hwnd int32 if len(args) > 0 { hwnd = args[0] - return cgetTitle(pid, hwnd) } xid, err := GetXId(xu, pid) if err != nil { - log.Println("GetXid from Pid errors is: ", err) + log.Println("Get Xid from Pid errors is: ", err) return "" } @@ -61,22 +59,22 @@ func internalGetTitle(pid int32, args ...int32) string { // ActivePIDC active the window by PID, // If args[0] > 0 on the unix platform via a xid to active -func ActivePIDC(pid int32, args ...int) { +func ActivePIDC(pid int32, args ...int) error { var hwnd int if len(args) > 0 { hwnd = args[0] - internalActive(pid, hwnd) - return + return nil } xid, err := GetXId(xu, pid) if err != nil { - log.Println("GetXid from Pid errors is: ", err) - return + log.Println("Get Xid from Pid errors is: ", err) + return err } internalActive(int32(xid), hwnd) + return nil } // ActivePID active the window by PID, diff --git a/window/window.h b/window/window.h index 8eda37b..6293ca9 100644 --- a/window/window.h +++ b/window/window.h @@ -85,7 +85,7 @@ void set_handle_pid_mData(uintptr pid, uintptr isHwnd){ bool IsValid(){ initWindow(initHandle); if (!IsAxEnabled(true)) { - printf("%s\n", "Window:Accessibility API is disabled!\n" + printf("%s\n", "Window: Accessibility API is disabled!\n" "Failed to enable access for assistive devices."); } MData actdata = GetActive();