Merge be5a13d7b3 into 48706562fc

window/win_sys.h

@@ -24,45 +24,33 @@ 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(AxWin, kAXPositionAttribute, (CFTypeRef*) &axp)
-			!= kAXErrorSuccess || axp == NULL) {
+		if (AXUIElementCopyAttributeValue(AxID, kAXPositionAttribute, (CFTypeRef*) &axp)
+			!= kAXErrorSuccess || axp == NULL){
 			goto exit;
 		}
 
 		// Determine the current size of the window
-		if (AXUIElementCopyAttributeValue(AxWin, kAXSizeAttribute, (CFTypeRef*) &axs)
-			!= kAXErrorSuccess || axs == NULL) {
+		if (AXUIElementCopyAttributeValue(AxID, 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)) {
+			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)