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

Merge pull request #730 from cnwangjie/fix-window-mac
Some checks are pending
Go / test (macOS-latest) (push) Waiting to run
Details
Go / test (windows-latest) (push) Waiting to run
Details

Browse Source 
Fix: use window ref instead of app ref to get bounds on macos
This commit is contained in:
Evans 2025-06-15 12:16:48 -07:00 committed by GitHub
commit dd208c6dd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
window/win_sys.h
View File

@ -3,7 +3,7 @@
// https://github.com/go-vgo/robotgo/blob/master/LICENSE // https://github.com/go-vgo/robotgo/blob/master/LICENSE
// //
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> // http://www.apache.org/licenses/LICENSE-2.0>
// //
// This file may not be copied, modified, or distributed // This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
@ -24,33 +24,45 @@ Bounds get_bounds(uintptr pid, int8_t isPid){
AXValueRef axp = NULL; AXValueRef axp = NULL;
AXValueRef axs = NULL; AXValueRef axs = NULL;
AXUIElementRef AxID = AXUIElementCreateApplication(pid); AXUIElementRef AxID = AXUIElementCreateApplication(pid);
AXUIElementRef AxWin = NULL;
// Get the window from the application
if (AXUIElementCopyAttributeValue(AxID, kAXFocusedWindowAttribute, (CFTypeRef *)&AxWin)
!= kAXErrorSuccess || AxWin == NULL) {
// If no focused window, try to get the main window
if (AXUIElementCopyAttributeValue(AxID, kAXMainWindowAttribute, (CFTypeRef *)&AxWin)
!= kAXErrorSuccess || AxWin == NULL) {
goto exit;
}
}
// Determine the current point of the window // Determine the current point of the window
if (AXUIElementCopyAttributeValue(AxID, kAXPositionAttribute, (CFTypeRef*) &axp) if (AXUIElementCopyAttributeValue(AxWin, kAXPositionAttribute, (CFTypeRef*) &axp)
!= kAXErrorSuccess || axp == NULL){ != kAXErrorSuccess || axp == NULL) {
goto exit; goto exit;
} }
// Determine the current size of the window // Determine the current size of the window
if (AXUIElementCopyAttributeValue(AxID, kAXSizeAttribute, (CFTypeRef*) &axs) if (AXUIElementCopyAttributeValue(AxWin, kAXSizeAttribute, (CFTypeRef*) &axs)
!= kAXErrorSuccess || axs == NULL){ != kAXErrorSuccess || axs == NULL) {
goto exit; goto exit;
} }
CGPoint p; CGSize s; CGPoint p; CGSize s;
// Attempt to convert both values into atomic types // Attempt to convert both values into atomic types
if (AXValueGetValue(axp, kAXValueCGPointType, &p) && if (AXValueGetValue(axp, kAXValueCGPointType, &p) &&
AXValueGetValue(axs, kAXValueCGSizeType, &s)){ AXValueGetValue(axs, kAXValueCGSizeType, &s)) {
bounds.X = p.x; bounds.X = p.x;
bounds.Y = p.y; bounds.Y = p.y;
bounds.W = s.width; bounds.W = s.width;
bounds.H = s.height; bounds.H = s.height;
} }
// return bounds;
exit: exit:
if (axp != NULL) { CFRelease(axp); } if (axp != NULL) { CFRelease(axp); }
if (axs != NULL) { CFRelease(axs); } if (axs != NULL) { CFRelease(axs); }
if (AxWin != NULL) { CFRelease(AxWin); }
if (AxID != NULL) { CFRelease(AxID); }
return bounds; return bounds;
#elif defined(USE_X11) #elif defined(USE_X11)
@ -126,7 +138,7 @@ Bounds get_client(uintptr pid, int8_t isPid) {
bounds.W = attr.width; bounds.W = attr.width;
bounds.H = attr.height; bounds.H = attr.height;
XCloseDisplay(rDisplay); XCloseDisplay(rDisplay);
return bounds; return bounds;
#elif defined(IS_WINDOWS) #elif defined(IS_WINDOWS)
HWND hwnd = getHwnd(pid, isPid); HWND hwnd = getHwnd(pid, isPid);
@ -148,4 +160,4 @@ Bounds get_client(uintptr pid, int8_t isPid) {
return bounds; return bounds;
#endif #endif
} }