merge

Author: sentialx

example.js

@@ -4,4 +4,14 @@ console.time("getActiveWindow");
 const window = windowManager.getActiveWindow();
 console.timeEnd("getActiveWindow");
 
-console.log(window.path);
+console.time("getTitle");
+console.log(window.getTitle());
+console.timeEnd("getTitle");
+
+console.time("getBounds");
+console.log(window.getBounds());
+console.timeEnd("getBounds");
+
+console.time("setBounds");
+window.setBounds({ x: 0, y: 0 });
+console.timeEnd("setBounds");

lib/macos.mm

@@ -4,12 +4,35 @@
 #include <napi.h>
 #include <string>
 #include <iostream>
+#include <map>
 
 extern "C" AXError _AXUIElementGetWindow(AXUIElementRef, CGWindowID* out);
 
 NSDictionary* opts = @{static_cast<id> (kAXTrustedCheckOptionPrompt): @YES};
 BOOL a = AXIsProcessTrustedWithOptions(static_cast<CFDictionaryRef> (opts));
 
+std::map<int, AXUIElementRef> m;
+
+AXUIElementRef getAXWindow(int pid, int handle) {
+  auto app = AXUIElementCreateApplication(pid);
+
+  NSArray *windows;
+  AXUIElementCopyAttributeValues(app, kAXWindowsAttribute, 0, 100, (CFArrayRef *) &windows);
+
+  for (id child in windows) {
+    auto window = (AXUIElementRef) child;
+
+    CGWindowID windowId;
+    _AXUIElementGetWindow(window, &windowId);
+
+    if (windowId == handle) {
+      return window;
+    }
+  }
+
+  return NULL;
+}
+
 Napi::Array getWindows(const Napi::CallbackInfo &info) {
   Napi::Env env{info.Env()};
 
@@ -28,6 +51,7 @@
     obj.Set("id", [windowNumber intValue]);
     obj.Set("processId", [ownerPid intValue]);
     obj.Set("path", app ? [app.bundleURL.path UTF8String] : "");
+    m[[windowNumber intValue]] = getAXWindow([ownerPid intValue], [windowNumber intValue]);
 
     vec.push_back(obj);
   }
@@ -60,6 +84,7 @@
     obj.Set("id", [windowNumber intValue]);
     obj.Set("processId", [ownerPid intValue]);
     obj.Set("path", [app.bundleURL.path UTF8String]);
+    m[[windowNumber intValue]] = getAXWindow([ownerPid intValue], [windowNumber intValue]);
 
     return obj;
   }
@@ -107,39 +132,18 @@
   return Napi::Object::New(env);
 }
 
-AXUIElementRef getAXWindow(int pid, int handle) {
-  auto app = AXUIElementCreateApplication(pid);
-
-  NSArray *windows;
-  AXUIElementCopyAttributeValues(app, kAXWindowsAttribute, 0, 100, (CFArrayRef *) &windows);
-
-  for (id child in windows) {
-    auto window = (AXUIElementRef) child;
-
-    CGWindowID windowId;
-    _AXUIElementGetWindow(window, &windowId);
-
-    if (windowId == handle) {
-      return window;
-    }
-  }
-
-  return NULL;
-}
-
 Napi::Boolean setWindowBounds(const Napi::CallbackInfo &info) {
   Napi::Env env{info.Env()};
 
   auto handle = info[0].As<Napi::Number>().Int32Value();
-  auto pid = info[1].As<Napi::Number>().Int32Value();
-  auto bounds = info[2].As<Napi::Object>();
+  auto bounds = info[1].As<Napi::Object>();
 
   auto x = bounds.Get("x").As<Napi::Number>().DoubleValue();
   auto y = bounds.Get("y").As<Napi::Number>().DoubleValue();
   auto width = bounds.Get("width").As<Napi::Number>().DoubleValue();
   auto height = bounds.Get("height").As<Napi::Number>().DoubleValue();
 
-  auto win = getAXWindow(pid, handle);
+  auto win = m[handle];
 
   if (win) {
     NSPoint point = NSMakePoint((CGFloat) x, (CGFloat) y);
@@ -170,10 +174,9 @@ AXUIElementRef getAXWindow(int pid, int handle) {
   Napi::Env env{info.Env()};
 
   auto handle = info[0].As<Napi::Number>().Int32Value();
-  auto pid = info[1].As<Napi::Number>().Int32Value();
-  auto toggle = info[2].As<Napi::Boolean>();
+  auto toggle = info[1].As<Napi::Boolean>();
 
-  auto win = getAXWindow(pid, handle);
+  auto win = m[handle];
 
   if (win) {
     AXUIElementSetAttributeValue(win, kAXMinimizedAttribute, toggle ? kCFBooleanTrue : kCFBooleanFalse);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-window-manager",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Manage windows in macOS, Windows and Linux",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/classes/window.ts

@@ -22,6 +22,7 @@ interface WindowInfo {
   bounds?: Rectangle;
   opacity?: number;
   owner?: Window;
+  axRef?: number;
 }
 
 export class Window {
@@ -77,7 +78,7 @@ export class Window {
 
       addon.setWindowBounds(this.id, newBounds);
     } else if (platform() === "darwin") {
-      addon.setWindowBounds(this.id, this.processId, newBounds);
+      addon.setWindowBounds(this.id, newBounds);
     }
   }