movewin 1.3 → 1.4

data/ext/movewin/movewin_ext.c

@@ -47,6 +47,7 @@ void Init_movewin_ext();
 VALUE MW_is_authorized(VALUE module);   /* MoveWin.authorized? */
 VALUE MW_display_size(VALUE module);    /* MoveWin.display_size */
 VALUE MW_windows(VALUE module);         /* MoveWin.windows */
+VALUE MW_Window_id(VALUE self);         /* MoveWin::Window.id */
 VALUE MW_Window_app_name(VALUE self);   /* MoveWin::Window.app_name */
 VALUE MW_Window_title(VALUE self);      /* MoveWin::Window.title */
 VALUE MW_Window_position(VALUE self);   /* MoveWin::Window.position */
@@ -91,6 +92,7 @@ void Init_movewin_ext() {
 
     /* Define class MoveWin::Window and its methods */
     MW_WindowClass = rb_define_class_under(MW_Module, "Window", rb_cObject);
+    rb_define_method(MW_WindowClass, "id",        MW_Window_id,            0);
     rb_define_method(MW_WindowClass, "app_name",  MW_Window_app_name,      0);
     rb_define_method(MW_WindowClass, "title",     MW_Window_title,         0);
     rb_define_method(MW_WindowClass, "position",  MW_Window_position,      0);
@@ -127,6 +129,19 @@ VALUE MW_windows(VALUE module) {
     return retval;
 }
 
+/* Return window ID a MoveWin::Window as an integer (nil for unknown) */
+VALUE MW_Window_id(VALUE self) {
+    void *mwWindow;
+    int windowId;
+
+    Data_Get_Struct(self, MW_Window, mwWindow);
+    windowId = CFDictionaryGetInt(
+        ((MW_Window *)mwWindow)->cgWindow, kCGWindowNumber
+    );
+
+    return INT2NUM(windowId);
+}
+
 /* Return application name (owner) of a MoveWin::Window as a Ruby string */
 VALUE MW_Window_app_name(VALUE self) {
     void *mwWindow;
@@ -244,28 +259,20 @@ VALUE MW_Window_to_string(VALUE self) {
 
 /* Given window CFDictionaryRef and Ruby array, push MW_Window to array */
 void StoreWindows(CFDictionaryRef cgWindow, void *rb_ary_ptr) {
-    int i;
     AXUIElementRef axWindow;
     MW_Window *mwWindow;
     VALUE wrappedMwWindow;
-    VALUE mwWindows;
-
-    mwWindows = (VALUE)rb_ary_ptr;
-
-    i = 0;
-    while(1) {
-         axWindow = AXWindowFromCGWindow(cgWindow, i);
-         if(!axWindow) break;
-         mwWindow = (MW_Window *)malloc(sizeof(MW_Window));
-         mwWindow->cgWindow =
-             CFDictionaryCreateCopy(kCFAllocatorDefault, cgWindow);
-         mwWindow->axWindow = axWindow;
-         wrappedMwWindow = Data_Wrap_Struct(
-             MW_WindowClass, NULL, MW_Window_destroy, (void *)mwWindow
-         );
-         rb_ary_push(mwWindows, wrappedMwWindow);
-         i++;
-    }
+    VALUE mwWindows = (VALUE)rb_ary_ptr;
+
+    axWindow = AXWindowFromCGWindow(cgWindow);
+    mwWindow = (MW_Window *)malloc(sizeof(MW_Window));
+    mwWindow->cgWindow =
+        CFDictionaryCreateCopy(kCFAllocatorDefault, cgWindow);
+    mwWindow->axWindow = axWindow;
+    wrappedMwWindow = Data_Wrap_Struct(
+        MW_WindowClass, NULL, MW_Window_destroy, (void *)mwWindow
+    );
+    rb_ary_push(mwWindows, wrappedMwWindow);
 }
 
 /* Free up MW_Window resources, for Ruby finalizer in Data_Wrap_Struct() */

data/ext/movewin/winutils.c

@@ -37,6 +37,12 @@
 #include <fnmatch.h>
 #include "winutils.h"
 
+/* Undocumented accessibility API to get window ID:
+ * http://stackoverflow.com/a/10134254
+ * https://github.com/jmgao/metamove/blob/master/src/window.mm
+ */
+extern AXError _AXUIElementGetWindow(AXUIElementRef, CGWindowID *out);
+
 /* Search windows for match (NULL for all), run function (NULL for none) */
 int EnumerateWindows(
     char *pattern,
@@ -165,17 +171,22 @@ bool isAuthorized() {
 #endif
 }
 
+/* Silence warning that address of _AXUIElementGetWindow is always true */
+#pragma GCC diagnostic ignored "-Waddress"
+
 /* Given window dictionary from CGWindowList, return accessibility object */
-AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window, int minIdx) {
+AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window) {
+    CGWindowID targetWindowId, actualWindowId;
     CFStringRef targetWindowName, actualWindowTitle;
     CGPoint targetPosition, actualPosition;
     CGSize targetSize, actualSize;
     pid_t pid;
     AXUIElementRef app, appWindow, foundAppWindow;
+    int i;
     CFArrayRef appWindowList;
-    int matchIdx, i;
 
-    /* Save the window name, position, and size we are looking for */
+    /* Save the window ID, name, position, and size we are looking for */
+    targetWindowId = CFDictionaryGetInt(window, kCGWindowNumber);
     targetWindowName = CFDictionaryGetValue(window, kCGWindowName);
     targetPosition = CGWindowGetPosition(window);
     targetSize = CGWindowGetSize(window);
@@ -187,37 +198,45 @@ AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window, int minIdx) {
         app, kAXWindowsAttribute, (CFTypeRef *)&appWindowList
     );
 
-    /* Search application windows for first matching title, position, size:
-     * http://stackoverflow.com/questions/6178860/getting-window-number-through-osx-accessibility-api
-     */
-    matchIdx = 0;
+    /* Search application windows to find a match */
     foundAppWindow = NULL;
     for(i = 0; i < CFArrayGetCount(appWindowList); i++) {
         appWindow = CFArrayGetValueAtIndex(appWindowList, i);
 
-        /* Window name must match */
-        AXUIElementCopyAttributeValue(
-            appWindow, kAXTitleAttribute, (CFTypeRef *)&actualWindowTitle
-        );
-        if( !actualWindowTitle ||
-            CFStringCompare(targetWindowName, actualWindowTitle, 0) != 0)
-        {
-            continue;
-        }
+        /* If possible, extract the window ID and match window by ID */
+        if(_AXUIElementGetWindow) {
+            _AXUIElementGetWindow(appWindow, &actualWindowId);
+            if(actualWindowId == targetWindowId) {
+                foundAppWindow = appWindow;
+                break;
+            } else {
+                continue;
+            }
+
+        /* Otherwise, search for first matching title, position, size:
+         * http://stackoverflow.com/questions/6178860/getting-window-number-through-osx-accessibility-api
+         */
+        } else {
 
-        /* Position and size must match */
-        actualPosition = AXWindowGetPosition(appWindow);
-        if(!CGPointEqualToPoint(targetPosition, actualPosition)) continue;
-        actualSize = AXWindowGetSize(appWindow);
-        if(!CGSizeEqualToSize(targetSize, actualSize)) continue;
+            /* Window name must match */
+            AXUIElementCopyAttributeValue(
+                appWindow, kAXTitleAttribute, (CFTypeRef *)&actualWindowTitle
+            );
+            if( !actualWindowTitle ||
+                CFStringCompare(targetWindowName, actualWindowTitle, 0) != 0)
+            {
+                continue;
+            }
+
+            /* Position and size must match */
+            actualPosition = AXWindowGetPosition(appWindow);
+            if(!CGPointEqualToPoint(targetPosition, actualPosition)) continue;
+            actualSize = AXWindowGetSize(appWindow);
+            if(!CGSizeEqualToSize(targetSize, actualSize)) continue;
 
-        /* Multiple windows may match, caller chooses which match to return */
-        if(matchIdx >= minIdx) {
             /* Found the first matching window, save it and break */
             foundAppWindow = appWindow;
             break;
-        } else {
-            matchIdx++;
         }
     }
     CFRelease(app);

data/ext/movewin/winutils.h

@@ -64,7 +64,7 @@ CGSize CGWindowGetSize(CFDictionaryRef window);
 bool isAuthorized();
 
 /* Given window dictionary from CGWindowList, return accessibility object */
-AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window, int minIdx);
+AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window);
 
 /* Get a value from an accessibility object */
 void AXWindowGetValue(

data/lib/movewin.rb

@@ -36,7 +36,7 @@
 require 'movewin/movewin_ext'
 
 module MoveWin
-  VERSION = '1.3'
+  VERSION = '1.4'
 
   # Individual accessors for display size components
   def self.display_width;  MoveWin.display_size[0]; end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: movewin
 version: !ruby/object:Gem::Version 
-  version: "1.3"
+  hash: 7
+  prerelease: 
+  segments: 
+  - 1
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - Andrew Ho
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-08 00:00:00 Z
+date: 2014-10-30 00:00:00 Z
 dependencies: []
 
 description: List and move OS X windows from Ruby via the OS X accessibility APIs.
@@ -29,28 +34,35 @@ files:
 homepage: https://github.com/andrewgho/movewin-ruby
 licenses: 
 - BSD-3-Clause
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - &id001 
-    - ">="
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id001
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.7
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: List and move OS X windows from Ruby
 test_files: []
 

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA1: 
-  metadata.gz: 186d90a92e2cba238cb35a3dd4c0ca998ae39c32
-  data.tar.gz: dbbebd61d13940f5e749697f81c0b121b9a57e5f
-SHA512: 
-  metadata.gz: 07394cd3f53cb282b2a606a46fc9802c5e773422f69a15b722cdf41aeea9e780ebb9d427e4ec95a1b22cf5feeb6cd582f6419a6ff39a8cf53ffbbc8868747ecd
-  data.tar.gz: 0cd496ec1c9c9d462db9c483d7908f04fc5a4313fe55cfa6dbd7cfe705e660345c40e2de79261c8cf81963d98551439af189828ddcf905f379279ef468742175