movewin 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: a193b21672c8447a18c0d52b7d8c46acc72e4848
-  data.tar.gz: 110afbc6ef126e64dc154b0a70ebd2f21d6fb837
+  metadata.gz: 186d90a92e2cba238cb35a3dd4c0ca998ae39c32
+  data.tar.gz: dbbebd61d13940f5e749697f81c0b121b9a57e5f
 SHA512: 
-  metadata.gz: 8e0f530fe1b99eaa8d1b98c7b49b6f2125937856859280f351d757b261ae60b5170393f7b07f48540a1d790cf7aa12b45318c1728d6818a7ee2d6c1138dc2160
-  data.tar.gz: 1eba09edc9672467643e5b3ab1cb4e0aebe77f4712038cba21253d6bf9c31511b3e2d57048b8b97d828ea297cfc23dde9fd875889d0c2913f5166c92393de6ea
+  metadata.gz: 07394cd3f53cb282b2a606a46fc9802c5e773422f69a15b722cdf41aeea9e780ebb9d427e4ec95a1b22cf5feeb6cd582f6419a6ff39a8cf53ffbbc8868747ecd
+  data.tar.gz: 0cd496ec1c9c9d462db9c483d7908f04fc5a4313fe55cfa6dbd7cfe705e660345c40e2de79261c8cf81963d98551439af189828ddcf905f379279ef468742175

data/ext/movewin/movewin_ext.c

@@ -67,6 +67,10 @@ void StoreWindows(CFDictionaryRef cgWindow, void *rb_ary_ptr);
 /* Callback for Data_Wrap_Struct(), frees internal refs with CFRelease() */
 void MW_Window_destroy(void *ref);
 
+/* Check if VALUE is number or has to_i() method; get number as integer */
+static bool canGetNumber(VALUE v);
+static int getNumber(VALUE v);
+
 /* Copy contents of a CFStringRef into a Ruby string */
 static VALUE convertStringRef(CFStringRef str);
 
@@ -188,11 +192,11 @@ VALUE MW_Window_set_position(VALUE self, VALUE args) {
         args = rb_ary_entry(args, 0);
     }
     if( RARRAY_LEN(args) == 2 &&
-        TYPE(rb_ary_entry(args, 0)) == T_FIXNUM &&
-        TYPE(rb_ary_entry(args, 1)) == T_FIXNUM )
+        canGetNumber(rb_ary_entry(args, 0)) &&
+        canGetNumber(rb_ary_entry(args, 1)) )
     {
-        position.x = NUM2INT(rb_ary_entry(args, 0));
-        position.y = NUM2INT(rb_ary_entry(args, 1));
+        position.x = getNumber(rb_ary_entry(args, 0));
+        position.y = getNumber(rb_ary_entry(args, 1));
     } else {
         rb_raise(rb_eArgError, "wrong number of arguments");
     }
@@ -211,11 +215,11 @@ VALUE MW_Window_set_size(VALUE self, VALUE args) {
         args = rb_ary_entry(args, 0);
     }
     if( RARRAY_LEN(args) == 2 &&
-        TYPE(rb_ary_entry(args, 0)) == T_FIXNUM &&
-        TYPE(rb_ary_entry(args, 1)) == T_FIXNUM )
+        canGetNumber(rb_ary_entry(args, 0)) &&
+        canGetNumber(rb_ary_entry(args, 1)) )
     {
-        size.width = NUM2INT(rb_ary_entry(args, 0));
-        size.height = NUM2INT(rb_ary_entry(args, 1));
+        size.width = getNumber(rb_ary_entry(args, 0));
+        size.height = getNumber(rb_ary_entry(args, 1));
     } else {
         rb_raise(rb_eArgError, "wrong number of arguments");
     }
@@ -253,7 +257,8 @@ void StoreWindows(CFDictionaryRef cgWindow, void *rb_ary_ptr) {
          axWindow = AXWindowFromCGWindow(cgWindow, i);
          if(!axWindow) break;
          mwWindow = (MW_Window *)malloc(sizeof(MW_Window));
-         mwWindow->cgWindow = cgWindow;
+         mwWindow->cgWindow =
+             CFDictionaryCreateCopy(kCFAllocatorDefault, cgWindow);
          mwWindow->axWindow = axWindow;
          wrappedMwWindow = Data_Wrap_Struct(
              MW_WindowClass, NULL, MW_Window_destroy, (void *)mwWindow
@@ -272,6 +277,28 @@ void MW_Window_destroy(void *ref) {
     free(mwWindow);
 }
 
+/* Return true if a VALUE is a number, or has a to_i() method */
+static bool canGetNumber(VALUE v) {
+    ID rb_respond_to = rb_intern("respond_to?");
+    ID rb_to_i = rb_intern("to_i");
+
+    return TYPE(v) == T_FIXNUM ||
+           rb_funcall(v, rb_respond_to, 1, ID2SYM(rb_to_i)) == Qtrue;
+}
+
+/* Return an integer for a VALUE, calling to_i() first if needed */
+static int getNumber(VALUE v) {
+    ID rb_to_i = rb_intern("to_i");
+
+    if(TYPE(v) == T_FIXNUM) {
+        return NUM2INT(v);
+    } else if(canGetNumber(v)) {
+        return NUM2INT(rb_funcall(v, rb_to_i, 0));
+    } else {
+        return 0;
+    }
+}
+
 /* Given a CFStringRef, copy its contents into a Ruby string */
 static VALUE convertStringRef(CFStringRef str) {
     CFRange range;

data/ext/movewin/winutils.c

@@ -94,6 +94,7 @@ int EnumerateWindows(
         if(windowName) free(windowName);
         if(appName) free(appName);
     }
+    CFRelease(windowList);
     if(subPattern != pattern) free(subPattern);
 
     return count;
@@ -219,6 +220,7 @@ AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window, int minIdx) {
             matchIdx++;
         }
     }
+    CFRelease(app);
 
     return foundAppWindow;
 }

data/lib/movewin.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: movewin
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - Andrew Ho
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-09-06 00:00:00 Z
+date: 2014-09-08 00:00:00 Z
 dependencies: []
 
 description: List and move OS X windows from Ruby via the OS X accessibility APIs.