Merge be5a13d7b3 into dd208c6dd1

Fix: use window ref instead of app ref to get bounds on macos

screen/screen_c.h

@@ -76,12 +76,25 @@ MMSizeInt32 getMainDisplaySize(void) {
 	CGSize size = displayRect.size;
 	return MMSizeInt32Make((int32_t)size.width, (int32_t)size.height);
 #elif defined(USE_X11)
-	Display *display = XGetMainDisplay();
-	const int screen = DefaultScreen(display);
+	// Display *display = XGetMainDisplay();
+	// const int screen = DefaultScreen(display);
 
-	return MMSizeInt32Make(
-						(int32_t)DisplayWidth(display, screen),
-	                	(int32_t)DisplayHeight(display, screen));
+	// return MMSizeInt32Make(
+	// 					(int32_t)DisplayWidth(display, screen),
+	//                 	(int32_t)DisplayHeight(display, screen));
+	    Display *display = XOpenDisplay(NULL);
+    if (display == NULL) {
+        return MMSizeInt32Make(0, 0); // Return an invalid size if unable to open display
+    }
+
+    const int screen = DefaultScreen(display);
+    MMSizeInt32 resolution = MMSizeInt32Make(
+        (int32_t)DisplayWidth(display, screen),
+        (int32_t)DisplayHeight(display, screen)
+    );
+
+    XCloseDisplay(display);
+    return resolution;
 #elif defined(IS_WINDOWS)
 	return MMSizeInt32Make(
  						(int32_t)GetSystemMetrics(SM_CXSCREEN),

window/win_sys.h

@@ -3,7 +3,7 @@
 // https://github.com/go-vgo/robotgo/blob/master/LICENSE
 //
 // 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
 // except according to those terms.
@@ -24,33 +24,45 @@ Bounds get_bounds(uintptr pid, int8_t isPid){
 		AXValueRef axp = NULL;
 		AXValueRef axs = NULL;
 		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
-		if (AXUIElementCopyAttributeValue(AxID, kAXPositionAttribute, (CFTypeRef*) &axp)
-			!= kAXErrorSuccess || axp == NULL){
+		if (AXUIElementCopyAttributeValue(AxWin, kAXPositionAttribute, (CFTypeRef*) &axp)
+			!= kAXErrorSuccess || axp == NULL) {
 			goto exit;
 		}
 
 		// Determine the current size of the window
-		if (AXUIElementCopyAttributeValue(AxID, kAXSizeAttribute, (CFTypeRef*) &axs)
-			!= kAXErrorSuccess || axs == NULL){
+		if (AXUIElementCopyAttributeValue(AxWin, kAXSizeAttribute, (CFTypeRef*) &axs)
+			!= kAXErrorSuccess || axs == NULL) {
 			goto exit;
 		}
 
 		CGPoint p; CGSize s;
 		// Attempt to convert both values into atomic types
-		if (AXValueGetValue(axp, kAXValueCGPointType, &p) && 
-			AXValueGetValue(axs, kAXValueCGSizeType, &s)){
+		if (AXValueGetValue(axp, kAXValueCGPointType, &p) &&
+			AXValueGetValue(axs, kAXValueCGSizeType, &s)) {
 			bounds.X = p.x;
 			bounds.Y = p.y;
 			bounds.W = s.width;
 			bounds.H = s.height;
 		}
-		
-		// return bounds;
+
 	exit:
 		if (axp != NULL) { CFRelease(axp); }
 		if (axs != NULL) { CFRelease(axs); }
+		if (AxWin != NULL) { CFRelease(AxWin); }
+		if (AxID != NULL) { CFRelease(AxID); }
 
 		return bounds;
     #elif defined(USE_X11)
@@ -126,7 +138,7 @@ Bounds get_client(uintptr pid, int8_t isPid) {
 		bounds.W = attr.width;
 		bounds.H = attr.height;
 		XCloseDisplay(rDisplay);
-		
+
 		return bounds;
 	#elif defined(IS_WINDOWS)
 		HWND hwnd = getHwnd(pid, isPid);
@@ -148,4 +160,4 @@ Bounds get_client(uintptr pid, int8_t isPid) {
 
 		return bounds;
 	#endif
-}
+}