movewin 1.4 → 1.5

data/ext/movewin/winutils.c

@@ -37,6 +37,11 @@
 #include <fnmatch.h>
 #include "winutils.h"
 
+/* These hardcoded applications are allowed to windows with no name */
+static int emptyWindowNameAllowed(char *appName) {
+    return 0 == strcmp(appName, "Messages");
+}
+
 /* Undocumented accessibility API to get window ID:
  * http://stackoverflow.com/a/10134254
  * https://github.com/jmgao/metamove/blob/master/src/window.mm
@@ -49,7 +54,7 @@ int EnumerateWindows(
     void(*callback)(CFDictionaryRef window, void *callback_data),
     void *callback_data
 ) {
-    int patternLen, subPatternLen, count, i, layer, titleSize;
+    int patternLen, subPatternLen, count, i, layer;
     char *subPattern, *starL, *starR, *appName, *windowName, *title;
     CFArrayRef windowList;
     CFDictionaryRef window;
@@ -84,10 +89,9 @@ int EnumerateWindows(
         appName = CFDictionaryCopyCString(window, kCGWindowOwnerName);
         if(!appName || !*appName) goto skip;
         windowName = CFDictionaryCopyCString(window, kCGWindowName);
-        if(!windowName || !*windowName) goto skip;
-        titleSize = strlen(appName) + strlen(" - ") + strlen(windowName) + 1;
-        title = (char *)malloc(titleSize);
-        snprintf(title, titleSize, "%s - %s", appName, windowName);
+        if(!windowName || (!*windowName && !emptyWindowNameAllowed(appName)))
+            goto skip;
+        title = windowTitle(appName, windowName);
 
         /* If no pattern, or pattern matches, run callback */
         if(!pattern || fnmatch(subPattern, title, 0) == 0) {
@@ -145,6 +149,27 @@ char *CFDictionaryCopyCString(CFDictionaryRef dict, const void *key) {
     return isSuccess ? value : NULL;
 }
 
+/* Return newly allocated window title like "appName - windowName" */
+char *windowTitle(char *appName, char *windowName) {
+    size_t titleSize;
+    char *title;
+
+    if(!appName || !*appName) {
+        title = (char *)malloc(1);
+        *title = '\0';
+    } else if(!windowName || !*windowName) {
+        titleSize = strlen(appName) + 1;
+        title = (char *)malloc(titleSize);
+        strncpy(title, appName, titleSize);
+    } else {
+        titleSize = strlen(appName) + strlen(" - ") + strlen(windowName) + 1;
+        title = (char *)malloc(titleSize);
+        snprintf(title, titleSize, "%s - %s", appName, windowName);
+    }
+
+    return title;
+}
+
 /* Given window dictionary from CGWindowList, return position */
 CGPoint CGWindowGetPosition(CFDictionaryRef window) {
     CFDictionaryRef bounds = CFDictionaryGetValue(window, kCGWindowBounds);
@@ -223,7 +248,7 @@ AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window) {
                 appWindow, kAXTitleAttribute, (CFTypeRef *)&actualWindowTitle
             );
             if( !actualWindowTitle ||
-                CFStringCompare(targetWindowName, actualWindowTitle, 0) != 0)
+                CFStringCompare(targetWindowName, actualWindowTitle, 0) != 0 )
             {
                 continue;
             }

data/ext/movewin/winutils.h

@@ -56,6 +56,9 @@ int CFDictionaryGetInt(CFDictionaryRef dict, const void *key);
 /* Copy a string value from a CFDictionary into a newly allocated string */
 char *CFDictionaryCopyCString(CFDictionaryRef dict, const void *key);
 
+/* Return newly allocated window title like "appName - windowName" */
+char *windowTitle(char *appName, char *windowName);
+
 /* Given window dictionary from CGWindowList, return position, size */
 CGPoint CGWindowGetPosition(CFDictionaryRef window);
 CGSize CGWindowGetSize(CFDictionaryRef window);

data/lib/movewin.rb

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

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: movewin
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
-  - 4
-  version: "1.4"
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - Andrew Ho
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-30 00:00:00 Z
+date: 2014-10-31 00:00:00 Z
 dependencies: []
 
 description: List and move OS X windows from Ruby via the OS X accessibility APIs.
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: List and move OS X windows from Ruby