(#17) Refactored window manager macOS implementation

Author: Simon Hofmann

src/macos/window_manager.mm

@@ -3,80 +3,69 @@
 #import <ApplicationServices/ApplicationServices.h>
 #include "../window_manager.h"
 
-std::vector<int64_t> getWindows() {
+NSDictionary* getWindowInfo(int64_t windowHandle) {
   CGWindowListOption listOptions = kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements;
   CFArrayRef windowList = CGWindowListCopyWindowInfo(listOptions, kCGNullWindowID);
 
-  std::vector<int64_t> windowHandles;
-
   for (NSDictionary *info in (NSArray *)windowList) {
-    NSNumber *ownerPid = info[(id)kCGWindowOwnerPID];
     NSNumber *windowNumber = info[(id)kCGWindowNumber];
 
-    auto app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];
-    auto path = app ? [app.bundleURL.path UTF8String] : "";
-
-    if (app && path != "") {
-      windowHandles.push_back([windowNumber intValue]);
+    if (windowHandle == [windowNumber intValue]) {
+      CFRetain(info);
+      CFRelease(windowList);
+      return info;
     }
   }
 
   if (windowList) {
     CFRelease(windowList);
   }
 
-  return windowHandles;
+  return nullptr;
 }
 
-MMRect getWindowRect(const int64_t windowHandle) {
+std::vector<WindowHandle> getWindows() {
   CGWindowListOption listOptions = kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements;
   CFArrayRef windowList = CGWindowListCopyWindowInfo(listOptions, kCGNullWindowID);
 
-  std::vector<std::string> windowNames;
+  std::vector<WindowHandle> windowHandles;
 
   for (NSDictionary *info in (NSArray *)windowList) {
     NSNumber *ownerPid = info[(id)kCGWindowOwnerPID];
     NSNumber *windowNumber = info[(id)kCGWindowNumber];
 
     auto app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];
+    auto path = app ? [app.bundleURL.path UTF8String] : "";
 
-    if (app && [windowNumber intValue] == windowHandle) {
-      CGRect windowRect;
-      if (CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)info[(id)kCGWindowBounds], &windowRect)) {
-        return MMRectMake(windowRect.origin.x, windowRect.origin.y, windowRect.size.height, windowRect.size.width);
-      }
-        return MMRectMake(0, 0, 0, 0);
+    if (app && path != "") {
+      windowHandles.push_back([windowNumber intValue]);
     }
   }
 
   if (windowList) {
     CFRelease(windowList);
   }
 
-  return MMRectMake(0, 0, 0, 0);
+  return windowHandles;
 }
 
-std::string getWindowTitle(const int64_t windowHandle) {
-  CGWindowListOption listOptions = kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements;
-  CFArrayRef windowList = CGWindowListCopyWindowInfo(listOptions, kCGNullWindowID);
-
-  std::vector<std::string> windowNames;
-
-  for (NSDictionary *info in (NSArray *)windowList) {
-    NSNumber *ownerPid = info[(id)kCGWindowOwnerPID];
-    NSNumber *windowNumber = info[(id)kCGWindowNumber];
-
-    auto app = [NSRunningApplication runningApplicationWithProcessIdentifier: [ownerPid intValue]];
-
-    if (app && [windowNumber intValue] == windowHandle) {
-      NSString *windowName = info[(id)kCGWindowName];
-      return [windowName UTF8String];
+MMRect getWindowRect(const WindowHandle windowHandle) {
+  auto windowInfo = getWindowInfo(windowHandle);
+  if (windowInfo != nullptr) {
+    CGRect windowRect;
+    if (CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)windowInfo[(id)kCGWindowBounds], &windowRect)) {
+      return MMRectMake(windowRect.origin.x, windowRect.origin.y, windowRect.size.height, windowRect.size.width);
     }
+    return MMRectMake(0, 0, 0, 0);
   }
+  return MMRectMake(0, 0, 0, 0);
+}
 
-  if (windowList) {
-    CFRelease(windowList);
+std::string getWindowTitle(const WindowHandle windowHandle) {
+  auto windowInfo = getWindowInfo(windowHandle);
+  if (windowInfo != nullptr) {
+    NSString *windowName = windowInfo[(id)kCGWindowName];
+    return [windowName UTF8String];
   }
-
   return "";
-}
+}